summaryrefslogtreecommitdiffstats
path: root/office
diff options
context:
space:
mode:
author Robby Workman2010-05-21 19:24:30 +0200
committer Robby Workman2010-05-24 06:21:40 +0200
commit7c31813faacaa8f5e35afdf5374954eb7b848fb3 (patch)
tree341e58fa7e5ef09de37c0fa687e49d2fb98c839a /office
parent687c0829c7be0de5b292df5636c0b5529145e1f6 (diff)
downloadslackbuilds-7c31813faacaa8f5e35afdf5374954eb7b848fb3.tar.gz
office/gnokii: Updated for version 0.6.29.
Diffstat (limited to 'office')
-rw-r--r--office/gnokii/gnokii.SlackBuild22
-rw-r--r--office/gnokii/gnokii.info6
2 files changed, 18 insertions, 10 deletions
diff --git a/office/gnokii/gnokii.SlackBuild b/office/gnokii/gnokii.SlackBuild
index d78929fa4b..58e7bc5496 100644
--- a/office/gnokii/gnokii.SlackBuild
+++ b/office/gnokii/gnokii.SlackBuild
@@ -27,11 +27,20 @@
# Modified by Robby Workman <rworkman@slackbuilds.org>
PRGNAM=gnokii
-VERSION=${VERSION:-0.6.28.1}
-ARCH=${ARCH:-i486}
+VERSION=${VERSION:-0.6.29}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -46,6 +55,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e
@@ -55,7 +67,6 @@ 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 . \
@@ -99,10 +110,7 @@ make install DESTDIR=$PKG \
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
diff --git a/office/gnokii/gnokii.info b/office/gnokii/gnokii.info
index b516e16503..1b4fbd3b83 100644
--- a/office/gnokii/gnokii.info
+++ b/office/gnokii/gnokii.info
@@ -1,8 +1,8 @@
PRGNAM="gnokii"
-VERSION="0.6.28.1"
+VERSION="0.6.29"
HOMEPAGE="http://www.gnokii.org/"
-DOWNLOAD="http://www.gnokii.org/download/gnokii/gnokii-0.6.28.1.tar.bz2"
-MD5SUM="520d300f1838460d374410ea99ff9a11"
+DOWNLOAD="http://www.gnokii.org/download/gnokii/gnokii-0.6.29.tar.bz2"
+MD5SUM="6111e0158a1129062bda6420db67c313"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Andrzej Telszewski"