ham/twhamqth: Updated for version 2.0.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 24 insertions, 5 deletions

diff --git a/ham/twhamqth/doinst.sh b/ham/twhamqth/doinst.sh
index 5fb28930db..a648bc1b7f 100644
--- a/ham/twhamqth/doinst.sh
+++ b/ham/twhamqth/doinst.sh
@@ -1,3 +1,19 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/X11/app-defaults/TwHamQTH.new
+
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
diff --git a/ham/twhamqth/slack-desc b/ham/twhamqth/slack-desc
index aa0c08720d..1d3527a2b5 100644
--- a/ham/twhamqth/slack-desc
+++ b/ham/twhamqth/slack-desc
@@ -12,8 +12,8 @@ twhamqth: twhamqth is a callsign lookup program that uses an online callsign
 twhamqth: database from the HamQTH site of Petr, OK2CQR. Given a callsign,
 twhamqth: twhamqth will return name, address, city, and country of the station.
 twhamqth:
+twhamqth: Homepage: http://wa0eir.bcts.info/twhamqth.html
 twhamqth:
 twhamqth:
 twhamqth:
-twhamqth: Homepage: http://wa0eir.bcts.info/twhamqth.html
 twhamqth:
diff --git a/ham/twhamqth/twhamqth.SlackBuild b/ham/twhamqth/twhamqth.SlackBuild
index f36b1a2dd1..3719fbf5ad 100644
--- a/ham/twhamqth/twhamqth.SlackBuild
+++ b/ham/twhamqth/twhamqth.SlackBuild
@@ -21,7 +21,7 @@
 # that is unlikely, as I am rather tall.
 
 PRGNAM=twhamqth
-VERSION=${VERSION:-1.4}
+VERSION=${VERSION:-2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,6 +86,9 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+# Don't overwrite the config file
+mv $PKG/etc/X11/app-defaults/TwHamQTH $PKG/etc/X11/app-defaults/TwHamQTH.new
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/ham/twhamqth/twhamqth.info b/ham/twhamqth/twhamqth.info
index 18214a4033..d2ce935d0e 100644
--- a/ham/twhamqth/twhamqth.info
+++ b/ham/twhamqth/twhamqth.info
@@ -1,8 +1,8 @@
 PRGNAM="twhamqth"
-VERSION="1.4"
+VERSION="2.0"
 HOMEPAGE="http://wa0eir.bcts.info/twhamqth.html"
-DOWNLOAD="http://wa0eir.bcts.info/src/twhamqth-1.4.src.tar.gz"
-MD5SUM="9632639b296596d9f398dce65bb522cf"
+DOWNLOAD="http://wa0eir.bcts.info/src/twhamqth-2.0.src.tar.gz"
+MD5SUM="728835cf4b5342f7b92cf73ec99bf415"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""