4 files changed, 31 insertions, 15 deletions
diff --git a/graphics/gpscorrelate/doinst.sh b/graphics/gpscorrelate/doinst.sh
new file mode 100644
index 0000000000..05a5c6c2a7
--- /dev/null
+++ b/graphics/gpscorrelate/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+   /usr/bin/update-desktop-database -q usr/share/applications
+fi
+
diff --git a/graphics/gpscorrelate/gpscorrelate.SlackBuild b/graphics/gpscorrelate/gpscorrelate.SlackBuild
index 2f6ee19199..5d42ea4223 100644
--- a/graphics/gpscorrelate/gpscorrelate.SlackBuild
+++ b/graphics/gpscorrelate/gpscorrelate.SlackBuild
@@ -4,8 +4,10 @@
 # Written by David Spencer <nobbutl@yahoo.co.uk>
 # This script is dedicated to the public domain
 
+# Modified by Robby Workman <rworkman@slackbuilds.org>
+
 PRGNAM=gpscorrelate
-VERSION=1.5.6
+VERSION=1.6.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -17,8 +19,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -32,23 +39,28 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-make CFLAGS="$SLKCFLAGS $(pkg-config --cflags libxml-2.0 gtk+-2.0) -I/usr/include/exiv2"
+make CFLAGS+="$SLKCFLAGS"
 
 mkdir -p $PKG/usr/bin
-for i in gpscorrelate gpscorrelate-gui ; do
-  strip --strip-unneeded $i
-  cp $i $PKG/usr/bin
-done
+cp gpscorrelate gpscorrelate-gui $PKG/usr/bin
+strip --strip-unneeded $PKG/usr/bin/*
+
+mkdir -p $PKG/usr/share/applications
+cat gpscorrelate.desktop > $PKG/usr/share/applications/gpscorrelate.desktop
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING INSTALL README RELEASES command-line-options.txt \
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
+cp -a COPYING INSTALL README RELEASES \
   $PKG/usr/doc/$PRGNAM-$VERSION
-( cd doc ; cp -a command.html concepts.html corr.png gui.html index.html \
-  $PKG/usr/doc/$PRGNAM-$VERSION )
+cp -a doc/{{command,concepts,gui,index}.html,corr.png} \
+  $PKG/usr/doc/$PRGNAM-$VERSION/html
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+mkdir -p $PKG/usr/man/man1
+gzip -9c gpscorrelate.1 > $PKG/usr/man/man1/gpscorrelate.1.gz
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/graphics/gpscorrelate/gpscorrelate.info b/graphics/gpscorrelate/gpscorrelate.info
index 773ff4190c..217eb72408 100644
--- a/graphics/gpscorrelate/gpscorrelate.info
+++ b/graphics/gpscorrelate/gpscorrelate.info
@@ -1,8 +1,8 @@
 PRGNAM="gpscorrelate"
-VERSION="1.5.6"
+VERSION="1.6.0"
 HOMEPAGE="http://freefoote.dview.net/linux_gpscorr.html"
-DOWNLOAD="http://freefoote.dview.net/linux/gpscorrelate-1.5.6.tar.gz"
-MD5SUM="a76ee92d6f37c7d7d3a3c36dcd07ba62"
+DOWNLOAD="http://freefoote.dview.net/linux/gpscorrelate-1.6.0.tar.gz"
+MD5SUM="efb02f5f86f8598ac0bd7211a3c90b72"
 MAINTAINER="David Spencer"
 EMAIL="nobbutl@yahoo.co.uk"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/graphics/gpscorrelate/slack-desc b/graphics/gpscorrelate/slack-desc
index 20cc5e4f11..44bfeda437 100644
--- a/graphics/gpscorrelate/slack-desc
+++ b/graphics/gpscorrelate/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+            |-----handy-ruler-------------------------------------------------|
 gpscorrelate: gpscorrelate (write EXIF GPS tags to photos using a GPX tracklog)
 gpscorrelate: 
 gpscorrelate: A GTK+ app and command line utility for geocoding JPEG photos.