games/fgo: Updated for version 1.5.4.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 36 insertions, 59 deletions

diff --git a/games/fgo/CHANGELOG b/games/fgo/CHANGELOG
index 0f7fa44ea3..fba287c0d4 100644
--- a/games/fgo/CHANGELOG
+++ b/games/fgo/CHANGELOG
@@ -1,3 +1,4 @@
+
 Changes to this SlackBuild since FGo! 1.4.5
 -------------------------------------------
 
@@ -5,7 +6,14 @@ Changes to this SlackBuild since FGo! 1.4.5
   a package for a version of FGo! older than 1.5.0, icons will not be linked
   correctly: in that case please modify this script accordingly, or use its
   previous version, or (recommended) download the latest FGo! release.
+
 * Removed presets for default FlightGear paths, as they are not included in
   the upstream package anyway.
+
 * 1.5.1, build 2: revision and cleanup.
+
 * 1.5.2: version update (new Japanese localization).
+
+* 1.5.4: version update, revision and cleanup. Removed 'fgo.desktop' from the
+  package, as it was moved to the FGo! upstream release. Modified symlinking
+  to icons, according to their new location.
diff --git a/games/fgo/README b/games/fgo/README
index 7c2cadb3ac..01fe5e4307 100644
--- a/games/fgo/README
+++ b/games/fgo/README
@@ -3,9 +3,9 @@ in Python by Robert Leda. It combines a simple graphical interface,
 where users can select an aircraft, airport, runway, parking position
 and scenario, with a text window which provides a way to specify more
 advanced command-line options that will be passed to FlightGear. These
-features allow FGo! to keep a simple, yet powerful design.
+features allow FGo! to keep a minimalist but powerful design.
 
 NOTE: FGo! versions equal or greater than 1.5.0 are compatible with
 FlightGear 3.0 and its new apt.dat database format. If you intend to use
-this SlackBuild for a version of FGo! older than 1.5.0, please read the
+this SlackBuild for a version of FGo! other than 1.5.4, please read the
 CHANGELOG file included in this package.
diff --git a/games/fgo/fgo.SlackBuild b/games/fgo/fgo.SlackBuild
index 890cb401ac..da8cddfe9a 100644
--- a/games/fgo/fgo.SlackBuild
+++ b/games/fgo/fgo.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Slackware build script for fgo!
+# Slackware build script for FGo!, a graphical front end for FlightGear
 
 # Copyright 2013-2014 Philip Lacroix <philnx at posteo dot de>
 # All rights reserved.
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fgo
-VERSION=${VERSION:-1.5.2}
+VERSION=${VERSION:-1.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,41 +59,37 @@ find -L . \
 PRGDIR=$PKG/opt/$PRGNAM
 PRGDAT=$PKG/opt/$PRGNAM/data
 PRGSHR=$PKG/usr/share
-PRGETC=$PKG/etc/$PRGNAM
-PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+PRGDOC=$PKG/usr/doc
+PRGETC=$PKG/etc
 
 # Copy files to destination.
 mkdir -p $PRGDIR
 cp -a * $PRGDIR/
 
-# Set permissions of the executable file; create symlink.
+# Set permissions of the executable file and create symlink.
 mkdir -p $PKG/usr/bin
 chmod 755 $PRGDIR/$PRGNAM
 ln -sf /opt/$PRGNAM/$PRGNAM $PKG/usr/bin/
 
-# Create entry for desktop menu.
-mkdir -p $PRGSHR/applications
-cat $CWD/$PRGNAM.desktop > $PRGSHR/applications/$PRGNAM.desktop
-
-# Create symlinks to icons.
-for size in 16x16 24x24 32x32 48x48 64x64 128x128 256x256 scalable ; do
-  if [ "${size}" != "scalable" ]; then EX=png ; else EX=svg ; fi
-  mkdir -p $PRGSHR/icons/hicolor/${size}/apps
-  ln -sf /opt/$PRGNAM/data/pics/icons/${size}/$PRGNAM.$EX \
-         $PRGSHR/icons/hicolor/${size}/apps/
-done
+# Create symlink to config directory.
+mkdir -p $PRGETC
+ln -sf /opt/$PRGNAM/data/config $PRGETC/$PRGNAM
 
-# Copy documentation, replace broken symlinks.
+# Create symlink to documentation.
 mkdir -p $PRGDOC
-cp -a $PRGDIR/docs/* $PRGDOC/
-cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
-for lang in de en es fr it ja pl ; do
-  ln -sf /opt/$PRGNAM/data/help/help_${lang} $PRGDOC/README/README_${lang}
+ln -sf /opt/$PRGNAM/docs $PRGDOC/$PRGNAM-$VERSION
+
+# Create symlinks to icons.
+for size in 16 24 32 48 64 128 256 scalable ; do
+  if [ $size != scalable ]; then ex=png; size=${size}x${size}; else ex=svg; fi
+  mkdir -p $PRGSHR/icons/hicolor/$size/apps
+  ln -sf /opt/$PRGNAM/share/icons/$size/$PRGNAM.$ex \
+         $PRGSHR/icons/hicolor/$size/apps/
 done
 
-# Create symlink to config directory.
-mkdir -p $PRGETC
-ln -sf /opt/$PRGNAM/data/config $PRGETC/
+# Create symlink to desktop file.
+mkdir -p $PRGSHR/applications
+ln -sf /opt/$PRGNAM/share/$PRGNAM.desktop $PRGSHR/applications/
 
 # Don't clobber config files.
 for conf in $PRGDAT/config/* ; do
diff --git a/games/fgo/fgo.desktop b/games/fgo/fgo.desktop
deleted file mode 100644
index b6184e9067..0000000000
--- a/games/fgo/fgo.desktop
+++ /dev/null
@@ -1,27 +0,0 @@
-[Desktop Entry]
-Name=FGo! (front-end for FlightGear)
-Name[de]=FGo! (Front-End für FlightGear)
-Name[es]=FGo! (lanzador para FlightGear)
-Name[fr]=FGo! (front-end pour FlightGear)
-Name[it]=FGo! (front-end per FlightGear)
-Name[nl]=FGo! (frontend voor FlightGear)
-Name[pl]=FGo! (front-end dla FlightGear)
-GenericName=front-end for FlightGear
-GenericName[de]=Front-End für FlightGear
-GenericName[es]=Lanzador para FlightGear
-GenericName[fr]=front-end pour FlightGear
-GenericName[it]=front-end per FlightGear
-GenericName[nl]=frontend voor FlightGear
-GenericName[pl]=front-end dla FlightGear
-Comment=A simple and fast front-end for FlightGear Flight Simulator
-Comment[de]=Einfaches und schnelles Front-End für FlightGear Flight Simulator
-Comment[es]=Un simple y rápido lanzador para FlightGear Flight Simulator
-Comment[fr]=Front-end simple et rapide pour FlightGear Flight Simulator
-Comment[it]=Un front-end semplice e veloce per FlightGear Flight Simulator
-Comment[nl]=Een eenvoudige en snelle frontend voor FlightGear Flight Simulator
-Comment[pl]=Prosty i szybki front-end dla FlightGear Flight Simulator
-Exec=fgo
-Terminal=false
-Type=Application
-Icon=fgo
-Categories=Game;
diff --git a/games/fgo/fgo.info b/games/fgo/fgo.info
index 14ae81bc5e..0b90442bdc 100644
--- a/games/fgo/fgo.info
+++ b/games/fgo/fgo.info
@@ -1,8 +1,8 @@
 PRGNAM="fgo"
-VERSION="1.5.2"
-HOMEPAGE="http://sites.google.com/site/erobosprojects/flightgear/add-ons/fgo"
-DOWNLOAD="https://sites.google.com/site/erobosprojects/flightgear/add-ons/fgo/download/fgo-1.5.2.tar.gz"
-MD5SUM="47c9ef55933dcf222512d36719424d7c"
+VERSION="1.5.4"
+HOMEPAGE="https://sites.google.com/site/erobosprojects/flightgear/add-ons/fgo"
+DOWNLOAD="https://sites.google.com/site/erobosprojects/flightgear/add-ons/fgo/download/fgo-1.5.4.tar.gz"
+MD5SUM="47bd3bd2d4bb2e8c464b0858c36f097b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="FlightGear"
diff --git a/games/fgo/slack-desc b/games/fgo/slack-desc
index 2b315c0fb9..eacd13533b 100644
--- a/games/fgo/slack-desc
+++ b/games/fgo/slack-desc
@@ -13,7 +13,7 @@ fgo: in Python by Robert Leda. It combines a simple graphical interface,
 fgo: where users can select an aircraft, airport, runway, parking position
 fgo: and scenario, with a text window which provides a way to specify more
 fgo: advanced command-line options that will be passed to FlightGear. These
-fgo: features allow FGo! to keep a simple, yet powerful design.
+fgo: features allow FGo! to keep a minimalist but powerful design.
 fgo: 
-fgo: http://sites.google.com/site/erobosprojects/flightgear/add-ons/fgo
+fgo: https://sites.google.com/site/erobosprojects/flightgear/add-ons/fgo
 fgo: