diff options
| author |   Eric Hameleers <alien@slackware.com> | 2012-07-05 21:01:00 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2012-07-05 21:01:00 +0000 |
| commit | 0b702846f5fa7b7c47b5308930b1505142cd6c41 (patch) | |
| tree | 43827e6014e9af3518a2ace1453e08a0df6869c2 | |
| parent | 3041733e41801c53b39f14e9e70ec7d3453d3f32 (diff) | |
| download | asb-0b702846f5fa7b7c47b5308930b1505142cd6c41.tar.gz asb-0b702846f5fa7b7c47b5308930b1505142cd6c41.tar.xz | |
Allow the package builder to override BUILD_PYTHON. Fix the slack-required file
| -rwxr-xr-x | calibre/build/calibre.SlackBuild | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild index ebe65f50..36fd302c 100755 --- a/calibre/build/calibre.SlackBuild +++ b/calibre/build/calibre.SlackBuild @@ -146,6 +146,12 @@ # * Update. # 0.8.56-1: 15/jun/2012 by Eric Hameleers <alien@slackware.com> # * Update. +# 0.8.57-1: 22/jun/2012 by Eric Hameleers <alien@slackware.com> +# * New release. Upgraded the internal pycrypto library. +# 0.8.58-1: 29/jun/2012 by Eric Hameleers <alien@slackware.com> +# * New release. +# 0.8.59-1: 06/jul/2012 by Eric Hameleers <alien@slackware.com> +# * New release. # # Run 'sh calibre.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -156,7 +162,7 @@ # Set initial variables: PRGNAM=calibre -VERSION=${VERSION:-0.8.56} +VERSION=${VERSION:-0.8.59} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} @@ -180,7 +186,7 @@ INT_LXML=2.3 INT_MECHANIZE=0.2.5 INT_SIP=4.13.2 INT_DBUSPYTHON=0.84.0 -INT_PYCRYPTO=2.3 +INT_PYCRYPTO=2.6 INT_PYQT=4.9.1 # Where do we look for sources? @@ -195,12 +201,17 @@ OUTPUT=${OUTPUT:-/tmp} SOURCE[0]="$SRCDIR/${PRGNAM}-${VERSION}.tar.xz" SRCURL[0]="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.xz" -if [ "$PYTHON" = "$REQUIRED_PYTHON" ]; then - BUILD_PYTHON="NO" -else - # We need to build our own python 2.7 plus supporting modules: - BUILD_PYTHON="YES" +# Allow the package builder to override BUILD_PYTHON: +if [ -z "$BUILD_PYTHON" ]; then + if [ "$PYTHON" = "$REQUIRED_PYTHON" ]; then + BUILD_PYTHON="NO" + else + # We need to build our own python 2.7 plus supporting modules: + BUILD_PYTHON="YES" + fi +fi +if [ "$BUILD_PYTHON" = "YES" ]; then SOURCE[1]="$SRCDIR/Python-${INT_PYTHON}.tar.bz2" SRCURL[1]="http://python.org/ftp/python/${INT_PYTHON}/Python-${INT_PYTHON}.tar.bz2" @@ -976,7 +987,7 @@ mkdir -p $PKG/install cat $SRCDIR/slack-desc > $PKG/install/slack-desc if [ "$BUILD_PYTHON" = "YES" ]; then cat $SRCDIR/slack-required \ - | grep -Ev "BeautifulSoup|dnspython|pysetuptools|python-cssutils|python-dateutil|python-imaging|python-mechanize|python-lxml" \ + | grep -Ev "BeautifulSoup|dnspython|pycrypto|pysetuptools|python-cssutils|python-dateutil|python-imaging|python-mechanize|python-lxml" \ > $PKG/install/slack-required else cat $SRCDIR/slack-required > $PKG/install/slack-required |