graphics/ristretto: Updated for version 0.0.22

4 files changed, 28 insertions, 15 deletions

diff --git a/graphics/ristretto/doinst.sh b/graphics/ristretto/doinst.sh
index 7ebfa3ab4d..1f8ff67ded 100644
--- a/graphics/ristretto/doinst.sh
+++ b/graphics/ristretto/doinst.sh
@@ -1,3 +1,10 @@
-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 [ -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
+
diff --git a/graphics/ristretto/ristretto.SlackBuild b/graphics/ristretto/ristretto.SlackBuild
index 1836974f13..eb9cf3d85a 100644
--- a/graphics/ristretto/ristretto.SlackBuild
+++ b/graphics/ristretto/ristretto.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ristretto
-VERSION=0.0.16
+VERSION=0.0.22
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,16 +33,18 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -59,14 +61,18 @@ chmod -R u+w,go+r-w,a-s .
 CFLAGS="$SLKCFLAGS" \
   ./configure \
   --prefix=/usr \
-  --docdir=/usr/doc/$PRGNAM-$VERSION
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
 make 
 make install DESTDIR=$PKG
 strip --strip-unneeded $PKG/usr/bin/ristretto
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*
 
diff --git a/graphics/ristretto/ristretto.info b/graphics/ristretto/ristretto.info
index 6711bef917..2b820a5a78 100644
--- a/graphics/ristretto/ristretto.info
+++ b/graphics/ristretto/ristretto.info
@@ -1,8 +1,8 @@
 PRGNAM="ristretto"
-VERSION="0.0.16"
+VERSION="0.0.22"
 HOMEPAGE="http://goodies.xfce.org/projects/applications/ristretto"
-DOWNLOAD="http://goodies.xfce.org/releases/ristretto/ristretto-0.0.16.tar.gz"
-MD5SUM="c27333131a53f5d61784d414bd8599df"
-MAINTAINER="Michael Wagner"
-EMAIL="lapinours@web.de"
-APPROVED="rworkman"
+DOWNLOAD="http://goodies.xfce.org/releases/ristretto/ristretto-0.0.22.tar.gz"
+MD5SUM="978ae19472c5a0b7d4b6622a68234a67"
+MAINTAINER="Robby Workman"
+EMAIL="rw@rlworkman.net"
+APPROVED="Erik Hanson"
diff --git a/graphics/ristretto/slack-desc b/graphics/ristretto/slack-desc
index d8778b5b16..eea2a8eea7 100644
--- a/graphics/ristretto/slack-desc
+++ b/graphics/ristretto/slack-desc
@@ -5,8 +5,8 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-         |-----handy-ruler--------------------------------------------------|
-ristretto: ristretto (image viewer)
+         |-----handy-ruler------------------------------------------------------|
+ristretto: ristretto (image viewer for the Xfce desktop environment)
 ristretto:
 ristretto: Ristretto is an image-viewer for the Xfce Desktop Environment.
 ristretto: