parametrize the calibre_pythondeps filename so I can distinguish between calibre 1.x and 2.x tarballs

1 files changed, 13 insertions, 10 deletions

diff --git a/calibre/build/calibre1.SlackBuild b/calibre/build/calibre1.SlackBuild
index 87d6cd96..f6c195e0 100755
--- a/calibre/build/calibre1.SlackBuild
+++ b/calibre/build/calibre1.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2010, 2011, 2012, 2013, 2014  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2011, 2012, 2013, 2014, 2015  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -366,6 +366,9 @@
 #             * Update.
 # 1.48.0-1:   08/aug/2014 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 1.48.0-2:   27/may/2015 by Eric Hameleers <alien@slackware.com>
+#             * Rebuilt for slackware-current, including all dependencies
+#               (except podofo) into the package.
 # 
 # Run 'sh calibre1.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -376,7 +379,7 @@
 PRGNAM=calibre1
 SRCNAM=calibre
 VERSION=${VERSION:-1.48.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 NUMJOBS=${NUMJOBS:-" -j4 "}
 TAG=${TAG:-alien}
 
@@ -1387,13 +1390,13 @@ make_calibre () {
 
 # Compilation of the software:
 if [ "$BUILD_PYTHON" = "YES" -o "$BUILD_QT" = "YES" -o "$BUILD_MTP" = "YES" ]; then
-  if  [ -f $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then
+  if  [ -f $SRCDIR/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then
     # We unwrap the tarball of compiled python internal libraries instead of
     # having to build them - this saves a _lot_ of compile time:
     mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre
     ( cd $PKG/usr/lib${LIBDIRSUFFIX}/calibre
       echo "**  Extracting dependencies tarball... **"
-      tar -jxf $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2
+      tar -jxf $SRCDIR/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2
       # We also need a copy in the filesystem root!
       rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre /usr/lib${LIBDIRSUFFIX}/
     )
@@ -1413,7 +1416,7 @@ fi
 if [ "$BUILD_MTP" = "YES" ]; then
   # No sufficiently new libmtp was found so we need to supply it ourself.
 
-  if  [ ! -f $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then
+  if  [ ! -f $SRCDIR/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then
     # No tarball containing pre-compiled libraries was found.
     # We need to build libmptp ourself.
     
@@ -1430,7 +1433,7 @@ fi
 if [ "$BUILD_QT" = "YES" ]; then
   # No sufficiently new Qt was found so we need to supply it ourself.
 
-  if  [ ! -f $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then
+  if  [ ! -f $SRCDIR/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then
     # No tarball containing pre-compiled libraries was found.
     # We need to build Qt ourself.
     
@@ -1447,7 +1450,7 @@ fi
 if [ "$BUILD_PYTHON" = "YES" ]; then
   # No python2.7 was found on the computer so we need to supply it ourself.
 
-  if  [ ! -f $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then
+  if  [ ! -f $SRCDIR/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then
     # No tarball containing pre-compiled python libraries was found.
     # We need to build python2.7 ourself.
     
@@ -1525,11 +1528,11 @@ if [ "$BUILD_PYTHON" = "YES" -o "$BUILD_QT" = "YES" -o "$BUILD_MTP" = "YES" ]; t
   # have to recompile them every time).
   # If you want to make use of this, then just copy the resulting tarball
   # into the same directory as this SlackBuild script:
-  if  [ ! -f $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then
+  if  [ ! -f $SRCDIR/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then
     ( cd $PKG/usr/lib${LIBDIRSUFFIX}/calibre
-      echo "** Creating dependencies tarball $OUTPUT/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2"
+      echo "** Creating dependencies tarball $OUTPUT/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2"
       echo "** Move this file to $SRCDIR for future compilation speedups."
-      tar -jcf $OUTPUT/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 .
+      tar -jcf $OUTPUT/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 .
     )
   fi
 fi