[duplicity/f22: 2/2] Merge branch 'f22' of ssh://pkgs.fedoraproject.org/duplicity into f22

[Jon Ciesla]

commit 60d26dbc25be3b42d9fd2674e88f22c29b8e38c1
Merge: f440bd0 34191c2
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Mar 2 07:50:26 2015 -0600

    Merge branch 'f22' of ssh://pkgs.fedoraproject.org/duplicity into f22

 duplicity-0.6.25-librsync-1.0.0.patch | 20 ++++++++++++++++++++
 duplicity.spec                        | 10 ++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
---
diff --cc duplicity.spec
index 1963e5d,000f66e..e73abd1
--- a/duplicity.spec
+++ b/duplicity.spec
@@@ -3,12 -3,12 +3,13 @@@
  Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
  Name:           duplicity
  Version:        0.6.25
--Release:        2%{?dist}
++Release:        3%{?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-0.6.25-librsync-1.0.0.patch
 +Patch0:         duplicity-0.6.25-deprecation.patch
++Patch1:         duplicity-0.6.25-librsync-1.0.0.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
@@@ -35,9 -35,8 +36,11 @@@ but not hard links
  
  %prep
  %setup -q
+ %patch0 -p1 -b .librsync-1.0.0
  
 +%patch0 -p0
++%patch1 -0
 +
  %build
  %{__python} setup.py build
  
@@@ -74,9 -73,9 +77,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_sysconfdir}/%{name}/cacert.pem
  
  %changelog
- * Mon Mar 02 2015 Jon Ciesla <limburgher at gmail.com> - 0.6.25-2
++* Mon Mar 02 2015 Jon Ciesla <limburgher at gmail.com> - 0.6.25-3
 +- Patch out deprecation warning to fix deja-dup, BZ 1197627.
 +
+ * Sun Mar 01 2015 Robert Scheck <robert at fedoraproject.org> 0.6.25-2
+ - Rebuild for librsync 1.0.0 (#1126712)
+ 
  * Thu Feb 26 2015 Jon Ciesla <limburgher at gmail.com> - 0.6.25-1
  - 0.6.25.