office/gnokii: Updated for version 0.6.28.1

3 files changed, 24 insertions, 16 deletions

diff --git a/office/gnokii/doinst.sh b/office/gnokii/doinst.sh
new file mode 100644
index 0000000000..4e8ba7071d
--- /dev/null
+++ b/office/gnokii/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/office/gnokii/gnokii.SlackBuild b/office/gnokii/gnokii.SlackBuild
index 464ad6bcaf..4392052867 100644
--- a/office/gnokii/gnokii.SlackBuild
+++ b/office/gnokii/gnokii.SlackBuild
@@ -11,13 +11,6 @@
 #
 # * 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 {company} nor the names of its
-#   contributors may be used to endorse or promote products derived from
-#   this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -34,7 +27,7 @@
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=gnokii
-VERSION=${VERSION:-0.6.27}
+VERSION=${VERSION:-0.6.28.1}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -46,10 +39,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 -e
@@ -59,6 +55,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+mv $(echo $PRGNAM-$VERSION | cut -f-3 -d'.') $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -71,6 +68,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -99,8 +97,10 @@ make install DESTDIR=$PKG \
   vcaldocsdir=/usr/doc/$PRGNAM-$VERSION/sample/vCalendar \
 
 ( 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
@@ -109,12 +109,14 @@ make install DESTDIR=$PKG \
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog COPYING COPYRIGHT INSTALL MAINTAINERS NEWS TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ChangeLog COPYING COPYRIGHT INSTALL MAINTAINERS NEWS TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/gnokii/gnokii.info b/office/gnokii/gnokii.info
index 04fabd013c..b516e16503 100644
--- a/office/gnokii/gnokii.info
+++ b/office/gnokii/gnokii.info
@@ -1,8 +1,10 @@
 PRGNAM="gnokii"
-VERSION="0.6.27"
+VERSION="0.6.28.1"
 HOMEPAGE="http://www.gnokii.org/"
-DOWNLOAD="http://www.gnokii.org/download/gnokii/gnokii-0.6.27.tar.bz2"
-MD5SUM="fd0ae7996a2e2a2c29e9f3c625df8f3d"
+DOWNLOAD="http://www.gnokii.org/download/gnokii/gnokii-0.6.28.1.tar.bz2"
+MD5SUM="520d300f1838460d374410ea99ff9a11"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Andrzej Telszewski"
 EMAIL="atelszewski@gmail.com"
 APPROVED="rworkman"