diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-10 10:00:34 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-10 10:00:34 +0100 |
| commit | fbe815aa83090984779a8b380cbfc1247353d98b (patch) | |
| tree | 2eb92ffe4f5cb6c6c13f065f3122d9f18264b6c6 /community/duplicity | |
| parent | d638a96c43b3c4fb9b517e8a66a4e8b1fa999833 (diff) | |
| parent | d22b68a6758c4f29a8e50a7be467374a53c68415 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/qtfm/PKGBUILD
core/binutils/PKGBUILD
core/fakeroot/PKGBUILD
core/gcc/PKGBUILD
core/linux-api-headers/PKGBUILD
extra/audacious/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/llvm/PKGBUILD
extra/maxima/PKGBUILD
extra/sbcl/PKGBUILD
extra/vigra/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-libgcrypt/PKGBUILD
multilib/lib32-libgpg-error/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
multilib/lib32-tdb/PKGBUILD
multilib/lib32-xcb-util/PKGBUILD
Diffstat (limited to 'community/duplicity')
| -rw-r--r-- | community/duplicity/PKGBUILD | 20 | ||||
| -rw-r--r-- | community/duplicity/botobackend.patch | 13 |
2 files changed, 26 insertions, 7 deletions
diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index 0a2b48572..08a9f5a31 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,17 +1,19 @@ -# $Id: PKGBUILD 59792 2011-11-30 10:03:59Z lfleischer $ +# $Id: PKGBUILD 60285 2011-12-08 22:52:59Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity pkgver=0.6.17 -pkgrel=2 +pkgrel=3 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm' arch=('i686' 'x86_64' 'mips64el') url='http://www.nongnu.org/duplicity/' license=('GPL') depends=('librsync' 'ncftp' 'python2' 'python-boto' 'python-gnupginterface') -source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('36423ab4e3b9aa90c5c44d9fa93fba0f') +source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz" + 'botobackend.patch') +md5sums=('36423ab4e3b9aa90c5c44d9fa93fba0f' + '49bbdc327230fe5985d18eaae37eec0c') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,9 +24,13 @@ build() { sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done + # add hotfix issued by upstream (FS#27390) + patch -p0 -i ../botobackend.patch + python2 setup.py install --root="$pkgdir" --optimize=1 - chmod 644 $pkgdir/usr/share/man/man1/$pkgname.1 - chmod 644 $pkgdir/usr/share/man/man1/rdiffdir.1 - chmod 644 $pkgdir/usr/share/doc/$pkgname-$pkgver/* + # fix broken documentation permissions until upstream does (FS#27301) + chmod 644 "$pkgdir/usr/share/man/man1/$pkgname.1" + chmod 644 "$pkgdir/usr/share/man/man1/rdiffdir.1" + chmod 644 "$pkgdir/usr/share/doc/$pkgname-$pkgver"/* } diff --git a/community/duplicity/botobackend.patch b/community/duplicity/botobackend.patch new file mode 100644 index 000000000..302e1e2b1 --- /dev/null +++ b/community/duplicity/botobackend.patch @@ -0,0 +1,13 @@ +=== modified file duplicity/backends/botobackend.py +--- duplicity/backends/botobackend.py 2011-11-25 17:47:57 +0000 ++++ duplicity/backends/botobackend.py 2011-12-01 16:15:25 +0000 +@@ -26,6 +26,6 @@ + if sys.version_info[:2] < (2,6): + print "Sorry, S3 multiprocessing requires version 2.6 or later of python" + sys.exit(1) +- import _boto_multi.py ++ import _boto_multi + else: +- import _boto_single.py ++ import _boto_single + |