desktop/obconf: Updated for version 2.0.3

5 files changed, 60 insertions, 21 deletions

diff --git a/desktop/obconf/README b/desktop/obconf/README
index b798e12d83..b6001420de 100644
--- a/desktop/obconf/README
+++ b/desktop/obconf/README
@@ -1,4 +1,4 @@
-ObConf is a GTK+ tool to assist with the configuration of the 
+ObConf is a GTK+ tool to assist with the configuration of the
 Openbox window manager.
 
 Requires Openbox, which is available on SlackBuilds.org.
diff --git a/desktop/obconf/doinst.sh b/desktop/obconf/doinst.sh
index 4557defa56..21e9945eb9 100644
--- a/desktop/obconf/doinst.sh
+++ b/desktop/obconf/doinst.sh
@@ -1,9 +1,13 @@
-
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database -q usr/share/applications
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
-if [ -x usr/bin/update-mime-database ]; then
-  usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
\ No newline at end of file
diff --git a/desktop/obconf/obconf.SlackBuild b/desktop/obconf/obconf.SlackBuild
index 0913ecbb17..9c7d6a242a 100644
--- a/desktop/obconf/obconf.SlackBuild
+++ b/desktop/obconf/obconf.SlackBuild
@@ -1,17 +1,35 @@
 #!/bin/sh
 
-# Slackware build script for obconf 
+# Slackware build script for obconf
 
-# Written by Chess Griffin <chess@chessgriffin.com>
+# Copyright 2006-2009 Chess Griffin <chess@chessgriffin.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=obconf
 VERSION=2.0.3
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -19,8 +37,13 @@ DOCS="ABOUT-NLS AUTHORS CHANGELOG COPYING README"
 
 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,12 +55,17 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var
 
@@ -45,8 +73,15 @@ make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
+
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/obconf/obconf.info b/desktop/obconf/obconf.info
index 2439719756..3bceb5e94b 100644
--- a/desktop/obconf/obconf.info
+++ b/desktop/obconf/obconf.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://icculus.org/openbox/obconf/obconf-2.0.3.tar.gz"
 MD5SUM="b22e273721851dedad72acbc77eefb68"
 MAINTAINER="Chess Griffin"
 EMAIL="chess@chessgriffin.com"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/desktop/obconf/slack-desc b/desktop/obconf/slack-desc
index c1c50f26a3..a067ff3c26 100644
--- a/desktop/obconf/slack-desc
+++ b/desktop/obconf/slack-desc
@@ -7,13 +7,13 @@
 
       |-----handy-ruler------------------------------------------------------|
 obconf: ObConf (Openbox preferences manager)
-obconf:  
-obconf: ObConf is a GTK+ tool to assist with the configuration of the 
+obconf:
+obconf: ObConf is a GTK+ tool to assist with the configuration of the
 obconf: Openbox window manager.
-obconf: 
+obconf:
 obconf: Homepage: http://icculus.org/openbox/index.php/ObConf:About
 obconf:
-obconf: 
-obconf: 
-obconf: 
-obconf: 
+obconf:
+obconf:
+obconf:
+obconf: