From a33b9b574c9bcc7109b784b1b012d2b898e534c9 Mon Sep 17 00:00:00 2001
From: Tim Dickson <dickson.tim@googlemail.com>
Date: Fri, 30 Sep 2016 19:48:22 +0700
Subject: academic/bibletime: Updated for version 2.11_rc2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 academic/bibletime/README               |  2 --
 academic/bibletime/bibletime.SlackBuild | 15 ++++++++-------
 academic/bibletime/bibletime.info       |  8 ++++----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/academic/bibletime/README b/academic/bibletime/README
index 811935c644..5ec6cd0e92 100644
--- a/academic/bibletime/README
+++ b/academic/bibletime/README
@@ -4,5 +4,3 @@ commentaries, dictionaries, and books provided by the Crosswire Bible Society.
 
 This version requires sword version 1.7.0 or higher
 
-NOTE: If you have qt5 installed, it will fail to build. Make sure to remove
-qt5 package first before building BibleTime.
diff --git a/academic/bibletime/bibletime.SlackBuild b/academic/bibletime/bibletime.SlackBuild
index c67e13117f..89c2617dc9 100644
--- a/academic/bibletime/bibletime.SlackBuild
+++ b/academic/bibletime/bibletime.SlackBuild
@@ -29,13 +29,13 @@
 # Modified by Tim Dickson (dickson.tim@googlemail.com)
 
 PRGNAM=bibletime
-VERSION=${VERSION:-2.10.1}
+VERSION=${VERSION:-2.11_rc2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -46,8 +46,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -68,7 +68,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar -xJvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -78,6 +77,7 @@ find -L . \
 
 mkdir build
 cd build
+echo "1 cmake from `pwd`"
   cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -85,8 +85,9 @@ cd build
     -DCMAKE_C_FLAGS="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
     -DLIB_SUFFIX=$LIBDIRSUFFIX ..
-
+echo "2 make"
   make
+echo "3 make install"
   make install DESTDIR=$PKG
 cd ..
 
@@ -97,7 +98,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
diff --git a/academic/bibletime/bibletime.info b/academic/bibletime/bibletime.info
index 3421b263fe..b37bfbacd1 100644
--- a/academic/bibletime/bibletime.info
+++ b/academic/bibletime/bibletime.info
@@ -1,10 +1,10 @@
 PRGNAM="bibletime"
-VERSION="2.10.1"
+VERSION="2.11_rc2"
 HOMEPAGE="http://www.bibletime.info/"
-DOWNLOAD="http://downloads.sourceforge.net/bibletime/bibletime-2.10.1.tar.xz"
-MD5SUM="ef4d189d53fd1608c56f4827947ffcf0"
+DOWNLOAD="http://downloads.sourceforge.net/bibletime/bibletime-2.11_rc2.tar.xz"
+MD5SUM="088988723ccf0c141669f00ab9f31f6e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="sword"
+REQUIRES="sword qt5"
 MAINTAINER="Tim Dickson"
 EMAIL="dickson.tim@googlemail.com"
-- 
cgit v1.2.3-80-g2a13