Date: Wednesday, March 18, 2015 @ 18:21:04 Author: kkeen Revision: 129543
upgpkg: python-pillow 2.7.0-2 Modified: python-pillow/trunk/PKGBUILD ----------+ PKGBUILD | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-03-18 17:11:14 UTC (rev 129542) +++ PKGBUILD 2015-03-18 17:21:04 UTC (rev 129543) @@ -5,7 +5,9 @@ pkgbase=python-pillow pkgname=(python-pillow python2-pillow) pkgver=2.7.0 -pkgrel=1 +# consider splitting out sane if this gets weird enough +_sanever=2.8.0 +pkgrel=2 _appname=Pillow _py2basever=2.7 _py3basever=3.4m @@ -15,15 +17,15 @@ license=('BSD') makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane') source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip" - "$pkgbase-$pkgver.tar.gz::https://github.com/python-pillow/Sane/archive/v$pkgver.tar.gz") + "Sane-$_sanever.tar.gz::https://github.com/python-pillow/Sane/archive/v$_sanever.tar.gz") md5sums=('da10ee9d0c0712c942224300c2931a1a' - '892cd70e3838250b615095d117173b57') + 'db1e4b1dff24264b2d798c3679aa10da') prepare() { cd "$srcdir" # allow sane to build - sed -i "s|os.path.join|'../libImaging', &|" "$srcdir/Sane-$pkgver/setup.py" - cp -r "$srcdir/Sane-$pkgver" "$srcdir/$_appname-$pkgver/Sane" + sed -i "s|os.path.join|'../libImaging', &|" "$srcdir/Sane-$_sanever/setup.py" + cp -r "$srcdir/Sane-$_sanever" "$srcdir/$_appname-$pkgver/Sane" # py2 and py3 cp -r "$srcdir/$_appname-$pkgver" "$srcdir/${_appname}2-$pkgver" } @@ -58,9 +60,8 @@ 'python2-pyqt4: for the ImageQt module') provides=('python-imaging' 'python2-imaging') conflicts=('python-imaging' 'python2-imaging') - replaces=('python2-imaging') cd "$srcdir/${_appname}2-$pkgver" - sed -i 's|/usr/local/bin/python$|/usr/bin/env python2|' PIL/OleFileIO.py + sed -i 's|python$|python2|' PIL/OleFileIO.py python2 setup.py install --root="$pkgdir/" --optimize=0 pushd Sane python2 setup.py install --root="$pkgdir/" --optimize=0