The calibre_pythondeps must not contain the calibre version - it will prevent us from re-using the tarball for the next calibre.

1 files changed, 27 insertions, 26 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index 9c7b0eb0..050d4e31 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -64,6 +64,7 @@ TAG=${TAG:-alien}
 DOCS="LICENSE* Changelog* COPYRIGHT README*"
 
 PYTHON=$(python -c 'import sys; print sys.version[:3]')
+SLACKVER=$(cat /etc/slackware-version |cut -d' ' -f2)
 
 REQUIRED_PYTHON="2.7"
 
@@ -287,9 +288,9 @@ make_python() {
   rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/calibre/share/man
 
   # Add documentation:
-  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/python
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/python
   cp -a LICENSE README \
-    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/python || true
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/python || true
 
 } # End of make_python
 
@@ -307,9 +308,9 @@ make_setuptools() {
     2>&1 | tee $OUTPUT/make-${PRGNAM}_setuptools.log
 
   # Add documentation:
-  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/setuptools
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/setuptools
   cp -a *.txt \
-    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/setuptools || true
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/setuptools || true
 
 } # End make_setuptools
 
@@ -342,9 +343,9 @@ make_dnspython() {
     2>&1 | tee $OUTPUT/make-${PRGNAM}_dnspython.log
 
   # Add documentation:
-  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/dnspython
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/dnspython
   cp -a ChangeLog LICENSE README TODO \
-    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/dnspython || true
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/dnspython || true
 
 } # End make_dnspython
 
@@ -366,9 +367,9 @@ make_cssutils() {
     2>&1 | tee $OUTPUT/make-${PRGNAM}_cssutils.log
 
   # Add documentation:
-  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/cssutils
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/cssutils
   cp -a COPYING* *.txt \
-    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/cssutils || true
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/cssutils || true
 
 } # End make_cssutils
 
@@ -386,9 +387,9 @@ make_dateutil() {
     2>&1 | tee $OUTPUT/make-${PRGNAM}_dateutil.log
 
   # Add documentation:
-  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/dateutil
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/dateutil
   cp -a LICENSE NEWS README \
-    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/dateutil || true
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/dateutil || true
 
 } # End make_dateutil
 
@@ -431,9 +432,9 @@ make_imaging() {
   )
 
   # Add documentation:
-  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/imaging
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/imaging
   cp -a README CHANGES \
-    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/imaging || true
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/imaging || true
 
 } # End make_imaging
 
@@ -451,9 +452,9 @@ make_lxml() {
     2>&1 | tee $OUTPUT/make-${PRGNAM}_lxml.log
 
   # Add documentation:
-  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/lxml
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/lxml
   cp -a *.txt doc/licenses \
-    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/lxml || true
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/lxml || true
 
 } # End make_lxml
 
@@ -472,9 +473,9 @@ make_mechanize() {
     2>&1 | tee $OUTPUT/make-${PRGNAM}_mechanize.log
 
   # Add documentation:
-  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/mechanize
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/mechanize
   cp -a *.txt \
-    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/mechanize || true
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/mechanize || true
 
 } # End make_mechanize
 
@@ -495,9 +496,9 @@ make_sip() {
   make install DESTDIR=$PKG 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_sip.log
 
   # Add documentation:
-  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/sip
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/sip
   cp -a LICENSE COPYING* NEWS README TODO \
-    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/sip || true
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/sip || true
 
 } # End make_sip
 
@@ -526,9 +527,9 @@ make_dbuspython() {
   make install DESTDIR=$PKG 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dbuspython.log
 
   # Add documentation:
-  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/dbus-python
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/dbus-python
   cp -a AUTHORS COPYING* INSTALL NEWS README* \
-    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/dbus-python || true
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/dbus-python || true
 
 }
 
@@ -562,9 +563,9 @@ make_pyqt() {
   rm -r $PKG/usr/lib${LIBDIRSUFFIX}/qt
 
   # Add documentation:
-  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/pyqt
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/pyqt
   cp -a GPL_EXCEPTION*.TXT LICENSE.* NEWS OPENSOURCE-NOTICE.TXT README THANKS \
-    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/pyqt || true
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/pyqt || true
 
 } # End make_pyqt
 
@@ -688,12 +689,12 @@ 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-$ARCH.tar.bz2 ]; then
+  if  [ -f $SRCDIR/calibre_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
-      tar -jxvf $SRCDIR/calibre_pythondeps-$ARCH.tar.bz2
+      tar -jxvf $SRCDIR/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2
       # We also need a copy in the filesystem root!
       rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre /usr/lib${LIBDIRSUFFIX}/
     )
@@ -759,7 +760,7 @@ if [ "$BUILD_PYTHON" = "YES" ]; then
     # If you want to make use of this, then just copy the resulting tarball
     # into the same directory as this SlackBuild script:
     ( cd $PKG/usr/lib${LIBDIRSUFFIX}/calibre
-      tar -jcvf $OUTPUT/calibre_pythondeps-$ARCH.tar.bz2 .
+      tar -jcvf $OUTPUT/calibre_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 .
     )
 
   fi
@@ -818,7 +819,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
 if [ "$BUILD_PYTHON" = "YES" ]; then
   # Add documentation (mainly licenses) of the internal python deps:
-  mv $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/$PRGNAM-$VERSION/* $PKG/usr/doc/$PRGNAM-$VERSION/
+  mv $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/* $PKG/usr/doc/$PRGNAM-$VERSION/
   rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc
 fi
 # Add all the patches we used to build this package: