From 2fb404bd5af957a8cdf068e4530e4a3b8e5bbd8e Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Wed, 6 Aug 2008 14:56:31 +0000
Subject: Updated for 1.5.1

---
 wicd/build/wicd.SlackBuild | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'wicd')

diff --git a/wicd/build/wicd.SlackBuild b/wicd/build/wicd.SlackBuild
index b8bb4e62..346911f2 100755
--- a/wicd/build/wicd.SlackBuild
+++ b/wicd/build/wicd.SlackBuild
@@ -36,6 +36,8 @@
 #             * The SVN version has important fixes
 # r362-1:     27/jul/2008 by Eric Hameleers <alien@slackware.com>
 #             * Lots of fixes again in SVN
+# 1.5.1-1:    06/aug/2008 by Eric Hameleers <alien@slackware.com>
+#             * Stable release.
 # 
 # Run 'sh wicd.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -46,13 +48,13 @@
 # Set initial variables:
 
 PRGNAM=wicd
-VERSION=${VERSION:-"r362"}        # SVN snapshot or official release
+VERSION=${VERSION:-"1.5.1"}        # SVN snapshot or official release
 BRANCH=${BRANCH:-"testing-1.5.0"} # SVN 'testing' branch is where it happens
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
-DOCS="AUTHORS INSTALL LICENSE README"
+DOCS="AUTHORS CHANGES INSTALL LICENSE README"
 
 PYTHONREQ=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.)
 
@@ -66,8 +68,8 @@ OUTPUT=${OUTPUT:-/tmp}
 
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
 # If SRCURL is empty, a SVN snapshot will be downloaded instead:
-#SRCURL="http://downloads.sourceforge.net/wicd/wicd_1.5.0rc3-1.tar.gz"
-SRCURL=""
+SRCURL="http://downloads.sourceforge.net/wicd/${PRGNAM}-${VERSION}.tar.gz"
+#SRCURL=""
 
 # This function checks out sources from SVN/CVS and creates a tarball of them.
 src_checkout() {
@@ -167,15 +169,15 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 echo Building ...
-# Fix missing icons in the GUI:
-#cat $SRCDIR/wicd_icons.patch | patch -p1 \
-#  2>&1 | tee $OUTPUT/patch-$PRGNAM.log
-# Fix the version in the setup script in case we use a SVN snapshot:
-sed -i -e "/\/etc\/slackware-version/,/elif os.access/s#/usr/doc/wicd-%s.*#/usr/doc/$PRGNAM-$VERSION'#" setup.py
+## Fix the version in the setup script in case we use a SVN snapshot:
+#sed -i -e "/\/etc\/slackware-version/,/elif os.access/s#/usr/doc/wicd-%s.*#/usr/doc/$PRGNAM-$VERSION'#" setup.py
+# Release 1.5.1 has a bug in the version definition:
+sed -i -e "s/VERSION_NUM = '1.5.0'/VERSION_NUM = '$VERSION'/" setup.py
 # Use our own Slackware rc script, overwriting what is in the source:
 cat $SRCDIR/rc.wicd > init/slackware/rc.wicd
 # Only needed to get updated translations:
 #python setup.py get_translations 2>&1 | tee $OUTPUT/lang-${PRGNAM}.log
+
 python setup.py configure 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 python setup.py install --root=$PKG 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 
@@ -208,6 +210,7 @@ config() {
   done
 }
 
+config etc/wicd/manager-settings.conf.new
 config etc/rc.d/rc.wicd.new
 config etc/dbus-1/system.d/wicd.conf.new
 
@@ -231,6 +234,11 @@ if [ -x usr/bin/update-desktop-database ]; then
   chroot . /usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1
 fi
 
+# Update the icon cache if one exists:
+if [ -r usr/share/icons/hicolor/icon-theme.cache ]; then
+  chroot . /usr/bin/gtk-update-icon-cache -t -f usr/share/icons/hicolor >/dev/null 2>&1
+fi
+
 PYTHON=\$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.)
 if [ "\$PYTHON" != "$PYTHONREQ" ]; then
   echo ""
@@ -238,6 +246,11 @@ if [ "\$PYTHON" != "$PYTHONREQ" ]; then
   echo ""
 fi
 
+echo ""
+echo "You need to kill the wicd client (tray icon),"
+echo "then restart the wicd daemon (run '/etc/rc.d/rc.wicd restart')."
+echo ""
+
 EOINS
 
 # Add documentation:
-- 
cgit v1.2.3