From 15b0d67980ea73107ad79fe41188e39299692c83 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Fri, 26 Oct 2012 23:21:09 +0000
Subject: Tweaks to build the final package

---
 gogui/build/gogui.SlackBuild | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

(limited to 'gogui/build')

diff --git a/gogui/build/gogui.SlackBuild b/gogui/build/gogui.SlackBuild
index f1a3663c..caec9b68 100755
--- a/gogui/build/gogui.SlackBuild
+++ b/gogui/build/gogui.SlackBuild
@@ -147,18 +147,16 @@ ant \
   -Dquaqua.ignore=true \
   -Ddocbook-xsl.dir=$XSLDIR \
   2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-ant javadoc \
-  2>&1 | tee $OUTPUT/makedoc-${PRGNAM}.log
 
-# Manual install:
-mkdir -p $PKG/usr/share/$PRGNAM
-install -pm 644 lib/*.jar $PKG/usr/share/$PRGNAM
+# Manual install of jar files and start scripts:
+mkdir -p $PKG/usr/share/$PRGNAM/lib
+install -pm 644 lib/*.jar $PKG/usr/share/$PRGNAM/lib
 mkdir -p $PKG/usr/bin
 for FILE in bin/*; do
   if [ -f $FILE -a -x $FILE ]; then
     cat $FILE \
-    | sed -e "s;^GOGUI_LIB=.*;GOGUI_LIB=\"$PKG/usr/share/$PRGNAM/lib\";" \
-    > $PKG/usr/bin/$FILE
+    | sed -e "s;^GOGUI_LIB=.*;GOGUI_LIB=\"/usr/share/$PRGNAM/lib\";" \
+    > $PKG/usr/$FILE
     chmod a+x $PKG/usr/$FILE
   fi
 done
@@ -172,6 +170,7 @@ mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps
 install -pm 644 src/net/sf/gogui/images/gogui.svg $PKG/usr/share/icons/hicolor/scalable/apps
 mkdir -p $PKG/usr/share/applications
 install -pm 644 config/gogui-gogui.desktop $PKG/usr/share/applications/gogui.desktop
+sed -i -e "s/=gogui-gogui/=gogui/" $PKG/usr/share/applications/gogui.desktop
 
 # Install shared mime info:
 mkdir -p $PKG/usr/share/mime/packages
@@ -180,22 +179,6 @@ install -pm 644 config/gogui-mime.xml $PKG/usr/share/mime/packages
 # Add this to the doinst.sh:
 mkdir -p $PKG/install
 cat <<EOINS >> $PKG/install/doinst.sh
-# Handle the incoming configuration files:
-config() {
-  for infile in \$1; do
-    NEW="\$infile"
-    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...
-  done
-}
-
 # An example of how you handle your '.new' config files:
 #config etc/gogui.conf.new
 
-- 
cgit v1.2.3-65-gdbad