[duplicity/epel7] update to 0.6.24-4

Andy Grover grover at fedoraproject.org
Mon Dec 8 17:40:17 UTC 2014


commit 87385563b7b32e4c63bfca88dd7bf5f0eb908f32
Author: Andy Grover <agrover at redhat.com>
Date:   Mon Dec 8 09:39:26 2014 -0800

    update to 0.6.24-4
    
    epel7: handle lack of python-dropbox

 duplicity-disable-dpbx.patch |    9 +++++++++
 duplicity.spec               |   10 ++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/duplicity-disable-dpbx.patch b/duplicity-disable-dpbx.patch
new file mode 100644
index 0000000..08726dd
--- /dev/null
+++ b/duplicity-disable-dpbx.patch
@@ -0,0 +1,9 @@
+diff -Naur duplicity-0.6.24/duplicity/backends/dpbxbackend.py duplicity-0.6.24.new/duplicity/backends/dpbxbackend.py
+--- duplicity-0.6.24/duplicity/backends/dpbxbackend.py	2014-05-09 06:27:39.000000000 -0700
++++ duplicity-0.6.24.new/duplicity/backends/dpbxbackend.py	2014-12-08 09:33:57.424015489 -0800
+@@ -260,4 +260,4 @@
+   return ''.join(reduce(lambda x,y:(x and len(x[-1])==1)and(x.append(y+
+           x.pop(-1))and x or x)or(x+[y]),s,[]))
+ 
+-duplicity.backend.register_backend("dpbx", DPBXBackend)
++# duplicity.backend.register_backend("dpbx", DPBXBackend)
diff --git a/duplicity.spec b/duplicity.spec
index c4c2215..9c8eeab 100644
--- a/duplicity.spec
+++ b/duplicity.spec
@@ -3,14 +3,15 @@
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
 Version:        0.6.24
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
+Patch0:         duplicity-disable-dpbx.patch
 Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
 Requires:       openssh-clients, ncftp >= 3.1.9, rsync, python-boto >= 0.9d
-Requires:       python-paramiko python-dropbox python-lockfile
+Requires:       python-paramiko python-lockfile
 
 %if 0%{?rhel}  != 5
 Requires:      ca-certificates
@@ -34,6 +35,7 @@ but not hard links.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -71,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/%{name}/cacert.pem
 
 %changelog
+* Mon Dec 8 2014 Andy Grover <agrover at redhat.com> - 0.6.24-4
+- Add patch disable-dpbx.patch
+- Remove python-dropbox as a Requires, not available in EPEL7
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.24-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list