desktop/brightside: Updated for version 1.4.0

5 files changed, 43 insertions, 8 deletions

diff --git a/desktop/brightside/README b/desktop/brightside/README
index 6bd3a5cc54..dfbcb7491f 100644
--- a/desktop/brightside/README
+++ b/desktop/brightside/README
@@ -1,4 +1,4 @@
 Brightside allows you to assign configurable actions to occur while
 you rest the mouse in a corner or bump the edge of the screen.
 
-Requires libgnomeui, available at SlackBuilds.org
+This requires libgnomeui.
diff --git a/desktop/brightside/brightside.SlackBuild b/desktop/brightside/brightside.SlackBuild
index 91d69da84b..f62493d34c 100644
--- a/desktop/brightside/brightside.SlackBuild
+++ b/desktop/brightside/brightside.SlackBuild
@@ -1,6 +1,26 @@
 #!/bin/sh
+
 # Slackware build script for brightside
-# Written by Erik Hanson  erik@slackbuilds.org
+
+# Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
+# 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=brightside
 VERSION=1.4.0
@@ -15,10 +35,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 -eu
@@ -45,6 +68,7 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var/lib \
   --mandir=/usr/man \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --disable-static \
   --enable-tray-icon \
   --build=$ARCH-slackware-linux
@@ -52,6 +76,10 @@ CFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
+# Move the .desktop around, since GNOME is unlikely.
+mv $PKG/usr/share/control-center-2.0/capplets $PKG/usr/share/applications
+rmdir $PKG/usr/share/control-center-2.0
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
 cp -a ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README doc/html \
       $PKG/usr/doc/$PRGNAM-$VERSION
@@ -61,4 +89,4 @@ 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
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/brightside/brightside.info b/desktop/brightside/brightside.info
index f15e0c3dc0..136f4e8708 100644
--- a/desktop/brightside/brightside.info
+++ b/desktop/brightside/brightside.info
@@ -3,6 +3,8 @@ VERSION="1.4.0"
 HOMEPAGE="http://packages.debian.org/unstable/gnome/brightside"
 DOWNLOAD="http://ftp.de.debian.org/debian/pool/main/b/brightside/brightside_1.4.0.orig.tar.gz"
 MD5SUM="7cbe6056db177fd2a4bfe7b0f889dec9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/desktop/brightside/doinst.sh b/desktop/brightside/doinst.sh
index af97e5f877..a4f64223c5 100644
--- a/desktop/brightside/doinst.sh
+++ b/desktop/brightside/doinst.sh
@@ -1,4 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
 GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
 chroot . gconftool-2 --makefile-install-rule \
     /usr/share/gconf/schemas/brightside.schemas \
     1>/dev/null
+
diff --git a/desktop/brightside/slack-desc b/desktop/brightside/slack-desc
index 465472eb19..9c3ca8bdd7 100644
--- a/desktop/brightside/slack-desc
+++ b/desktop/brightside/slack-desc
@@ -5,12 +5,12 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-     |-----handy-ruler------------------------------------------------------|
+          |-----handy-ruler------------------------------------------------------|
 brightside: Brightside (Reactivity for desktop corners and edges)
 brightside:
-brightside: Brightside allows you to assign configurable actions to occur
-brightside: while you rest the mouse in a corner or bump the edge of the
-brightside: screen.
+brightside: Brightside allows you to assign configurable actions to occur while
+brightside: you rest the mouse in a corner or bump the edge of the screen.
+brightside:
 brightside:
 brightside:
 brightside: