graphics/gwenview: Updated for version 1.4.2

5 files changed, 39 insertions, 51 deletions

diff --git a/graphics/gwenview/README b/graphics/gwenview/README
index bb3e400d29e5..651d58abc77f 100644
--- a/graphics/gwenview/README
+++ b/graphics/gwenview/README
@@ -6,4 +6,4 @@ be used as standalone application or embedded in Konqueror via KParts.
 Internationalization files are available in the gwenview-i18n package.
 
 Gwenview depends on exiv2 (mandatory) and libkipi (optional), both of 
-which are available from slackbuilds.org. 
+which are available from SlackBuilds.org. 
diff --git a/graphics/gwenview/doinst.sh b/graphics/gwenview/doinst.sh
new file mode 100644
index 000000000000..e20bb9e5f056
--- /dev/null
+++ b/graphics/gwenview/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x usr/bin/update-desktop-database ]; then
+    usr/bin/update-desktop-database -q usr/share/applications/kde > /dev/null 2>&1
+fi
+
diff --git a/graphics/gwenview/gwenview.SlackBuild b/graphics/gwenview/gwenview.SlackBuild
index 80cafb8bee07..f812c2e1eeb7 100644
--- a/graphics/gwenview/gwenview.SlackBuild
+++ b/graphics/gwenview/gwenview.SlackBuild
@@ -1,33 +1,28 @@
 #!/bin/sh
 # 
-# Slackware build script for gwenview
-# All rights reserved. (C) 2007 Michael Wagner <lapinours@web.de>
+# Slackware build script for gwenview 
+# (C) 2007 Michael Wagner <lapinours@web.de> 
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the <organization> nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
 #
-# THIS SOFTWARE IS PROVIDED BY Michael Wagner ``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 Michael Wagner 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.
-
+# 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=gwenview
-VERSION=1.4.1
+VERSION=1.4.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -48,34 +43,22 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
 cd $PRGNAM-$VERSION || exit 1
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# libkipi is optional, add --without-libkipi if you
-# don't want it. 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=/opt/kde \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/opt/kde/man \
+  --prefix=/usr \
+  --mandir=/usr/man \
   || exit 1
-  
-make || exit 1
-make install DESTDIR=$PKG || exit 1
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+make || exit 1
+make install-strip DESTDIR=$PKG || exit 1
 
-( cd $PKG/opt/kde/man
-  find . -name "*.?" -type f 2> /dev/null | xargs gzip -9 2> /dev/null
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+gzip -9 $PKG/usr/man/man1/* 2> /dev/null
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -84,6 +67,7 @@ chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 mkdir -p $PKG/install
 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
diff --git a/graphics/gwenview/gwenview.info b/graphics/gwenview/gwenview.info
index a713ff9ea3ec..9d8f45ddb151 100644
--- a/graphics/gwenview/gwenview.info
+++ b/graphics/gwenview/gwenview.info
@@ -1,8 +1,8 @@
 PRGNAM="gwenview"
-VERSION="1.4.1"
+VERSION="1.4.2"
 HOMEPAGE="http://gwenview.sourceforge.net"
-DOWNLOAD="http://prdownloads.sourceforge.net/gwenview/gwenview-1.4.1.tar.bz2"
-MD5SUM="df5df7ace3e7bec73f96bf1646ab27b0"
+DOWNLOAD="http://downloads.sourceforge.net/gwenview/gwenview-1.4.2.tar.bz2"
+MD5SUM="33c3fc68224d57f5f5cc4d34b48293c6"
 MAINTAINER="Michael Wagner"
 EMAIL="lapinours@web.de"
-APPROVED="BP{k}"
+APPROVED="rworkman"
diff --git a/graphics/gwenview/slack-desc b/graphics/gwenview/slack-desc
index 509e60fe89a4..6cb770a305df 100644
--- a/graphics/gwenview/slack-desc
+++ b/graphics/gwenview/slack-desc
@@ -5,14 +5,14 @@
 # make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
-        |-----handy-ruler------------------------------------------------------|
-gwenview: Gwenview Image Viewer 
+        |-----handy-ruler---------------------------------------------------|
+gwenview: Gwenview Image Viewer (image viewer for KDE)
 gwenview:
 gwenview: Gwenview is a fast and easy to use image viewer for KDE.
 gwenview: It features a folder tree window as well as a file list window
 gwenview: to provide easy navigation among your images. Gwenview can either 
-gwenview: be used as standalone application or embedded in Konqueror via KParts.
-gwenview:
+gwenview: be used as standalone application or embedded in Konqueror via 
+gwenview: KParts. 
 gwenview: Internationalization files are available in an extra package.
 gwenview: 
 gwenview: Homepage: http://gwenview.sourceforge.net