summaryrefslogtreecommitdiff
path: root/office/fbreader
diff options
context:
space:
mode:
Diffstat (limited to 'office/fbreader')
-rw-r--r--office/fbreader/README5
-rw-r--r--office/fbreader/fbreader.SlackBuild18
-rw-r--r--office/fbreader/fbreader.info6
3 files changed, 20 insertions, 9 deletions
diff --git a/office/fbreader/README b/office/fbreader/README
index 157784bd71..0665124528 100644
--- a/office/fbreader/README
+++ b/office/fbreader/README
@@ -2,6 +2,5 @@ FBReader is e-book reader for Linux PDAs and desktop.
This requires liblinebreak.
-This builds the Qt-based user interface by default; if you prefer to build
-the GTK interface instead, run the script as follows:
- UI=gtk ./fbreader.SlackBuild
+This builds the Qt-based user interface by default; if you prefer the GTK
+interface instead, run the script as follows: UI=gtk ./fbreader.SlackBuild
diff --git a/office/fbreader/fbreader.SlackBuild b/office/fbreader/fbreader.SlackBuild
index f1a3d68402..68edd53452 100644
--- a/office/fbreader/fbreader.SlackBuild
+++ b/office/fbreader/fbreader.SlackBuild
@@ -3,14 +3,22 @@
# Slackware build script for fbreader
# Originally written by Audrius Kazukauskas <audrius@neutrino.lt>
# Maintained as of version 0.12.1 by Niels Horn <niels.horn@gmail.com>
-# revision date: 2010/03/27
+# revision date: 2010/06/01
PRGNAM=fbreader
-VERSION=0.12.9
-ARCH=${ARCH:-i486}
+VERSION=${VERSION:-0.12.10}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -37,6 +45,10 @@ elif [ "$ARCH" = "arm" ]; then
SLKCFLAGS="-O2 -march=armv4t"
LIBDIRSUFFIX=""
ARCHQUADLET="-gnueabi"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+ ARCHQUADLET=""
fi
set -e # Exit on most errors
diff --git a/office/fbreader/fbreader.info b/office/fbreader/fbreader.info
index 5866defae3..ba627c27b8 100644
--- a/office/fbreader/fbreader.info
+++ b/office/fbreader/fbreader.info
@@ -1,8 +1,8 @@
PRGNAM="fbreader"
-VERSION="0.12.9"
+VERSION="0.12.10"
HOMEPAGE="http://fbreader.org/"
-DOWNLOAD="http://fbreader.org/fbreader-sources-0.12.9.tgz"
-MD5SUM="c034408e001edd88f576274188e42fa3"
+DOWNLOAD="http://fbreader.org/fbreader-sources-0.12.10.tgz"
+MD5SUM="da9ec4721efdb0ec0aaa182bff16ad82"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Niels Horn"