diff --git a/.cvsignore b/.cvsignore index 0dca751..76b7b1d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -duplicity-0.4.11.tar.gz +duplicity-0.4.12.tar.gz diff --git a/duplicity-0.4.11-python23.patch b/duplicity-0.4.11-python23.patch deleted file mode 100644 index b31cdf4..0000000 --- a/duplicity-0.4.11-python23.patch +++ /dev/null @@ -1,46 +0,0 @@ -Patch by Robert Scheck to get duplicity >= 0.4.11 building with -older Python 2.3 again. This release done by Kenneth Loafman luckily -got Python 2.3 support back. Second part of the patch replaces the use of functionality of -Python >= 2.4 functions. For further information, see: - - - http://lists.gnu.org/archive/html/duplicity-talk/2008-05/msg00036.html - - https://bugzilla.redhat.com/show_bug.cgi?id=453069 - ---- duplicity-0.4.11/setup.py 2008-05-05 16:40:53.000000000 +0200 -+++ duplicity-0.4.11/setup.py.python23 2008-05-05 21:45:35.000000000 +0200 -@@ -5,8 +5,8 @@ - - version_string = "0.4.11" - --if sys.version_info[:2] < (2,4): -- print "Sorry, duplicity requires version 2.4 or later of python" -+if sys.version_info[:2] < (2,3): -+ print "Sorry, duplicity requires version 2.3 or later of python" - sys.exit(1) - - try: ---- duplicity-0.4.11/src/collections.py 2008-05-05 16:40:53.000000000 +0200 -+++ duplicity-0.4.11/src/collections.py.python23 2008-06-28 10:53:35.000000000 +0200 -@@ -789,6 +789,10 @@ - NOTE: n = 1 -> time of latest available chain (n = 0 is not - a valid input). Thus the second-to-last is obtained with n=2 - rather than n=1.""" -+ -+ def mycmp(x, y): -+ return cmp(x.get_first().time, y.get_first().time) -+ - assert self.values_set - assert n > 0 - -@@ -796,9 +800,9 @@ - return None - - sorted = self.all_backup_chains[:] -- sorted.sort(reverse = True, -- key = lambda chain: chain.get_first().time) -+ sorted.sort(mycmp) - -+ sorted.reverse() - return sorted[n - 1] - - def get_older_than(self, t): diff --git a/duplicity.spec b/duplicity.spec index 73dde2d..f96ce7b 100644 --- a/duplicity.spec +++ b/duplicity.spec @@ -2,13 +2,12 @@ Summary: Encrypted bandwidth-efficient backup using rsync algorithm Name: duplicity -Version: 0.4.11 -Release: 2%{?dist} +Version: 0.4.12 +Release: 1%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.nongnu.org/duplicity/ Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz -Patch: duplicity-0.4.11-python23.patch Requires: python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6, rsync Requires: pexpect >= 2.1, openssh-clients, ncftp >= 3.1.9, python-boto >= 0.9d BuildRequires: python-devel >= 2.3, librsync-devel >= 0.9.6, pexpect >= 2.1 @@ -29,7 +28,6 @@ but not hard links. %prep %setup -q -%patch -p1 -b .python23 %build %{__python} setup.py build @@ -51,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/%{name}* %changelog +* Sun Jul 27 2008 Robert Scheck 0.4.12-1 +- Upgrade to 0.4.12 + * Sat Jun 28 2008 Robert Scheck 0.4.11-2 - Added patch for incremental backups using python 2.3 (#453069) diff --git a/sources b/sources index 24e1fae..ee0e100 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8891bb4fa2b5d3f053e6f2c4a91782f2 duplicity-0.4.11.tar.gz +2cec2aba2b0d770c70601862af94f896 duplicity-0.4.12.tar.gz