From d22b68a6758c4f29a8e50a7be467374a53c68415 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 9 Dec 2011 23:14:52 +0000
Subject: Fri Dec  9 23:14:52 UTC 2011

---
 community/duplicity/PKGBUILD          | 20 +++++++++++++-------
 community/duplicity/botobackend.patch | 13 +++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 community/duplicity/botobackend.patch

(limited to 'community/duplicity')

diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD
index 2c0d8feae..adcaa6edb 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')
 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
+
-- 
cgit v1.2.3-54-g00ecf