diff --git a/.cvsignore b/.cvsignore index 17ce404..56c95c9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -duplicity-0.4.3.tar.gz +duplicity-0.4.9.tar.gz diff --git a/duplicity-0.4.9-python23.patch b/duplicity-0.4.9-python23.patch new file mode 100644 index 0000000..28903f5 --- /dev/null +++ b/duplicity-0.4.9-python23.patch @@ -0,0 +1,104 @@ +Patch by Robert Scheck which makes duplicity >= 0.4.9 working +using the older Python 2.3, that doesn't support the non-decorator syntax, which is used +at @property. + +--- duplicity-0.4.9/setup.py 2008-01-04 19:11:39.000000000 +0100 ++++ duplicity-0.4.9/setup.py.python23 2008-02-04 23:21:15.000000000 +0100 +@@ -5,8 +5,8 @@ + + version_string = "0.4.9" + +-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.9/src/urlparse_2_5.py 2008-01-04 19:11:39.000000000 +0100 ++++ duplicity-0.4.9/src/urlparse_2_5.py.python23 2008-02-04 23:24:42.000000000 +0100 +@@ -55,30 +55,29 @@ + + # Attributes that access the basic components of the URL: + +- @property + def scheme(self): + return self[0] ++ scheme = property(scheme) + +- @property + def netloc(self): + return self[1] ++ netloc = property(netloc) + +- @property + def path(self): + return self[2] ++ path = property(path) + +- @property + def query(self): + return self[-2] ++ query = property(query) + +- @property + def fragment(self): + return self[-1] ++ fragment = property(fragment) + + # Additional attributes that provide access to parsed-out portions + # of the netloc: + +- @property + def username(self): + netloc = self.netloc + if "@" in netloc: +@@ -87,8 +86,8 @@ + userinfo = userinfo.split(":", 1)[0] + return userinfo + return None ++ username = property(username) + +- @property + def password(self): + netloc = self.netloc + if "@" in netloc: +@@ -96,8 +95,8 @@ + if ":" in userinfo: + return userinfo.split(":", 1)[1] + return None ++ password = property(password) + +- @property + def hostname(self): + netloc = self.netloc + if "@" in netloc: +@@ -105,8 +104,8 @@ + if ":" in netloc: + netloc = netloc.split(":", 1)[0] + return netloc.lower() or None ++ hostname = property(hostname) + +- @property + def port(self): + netloc = self.netloc + if "@" in netloc: +@@ -115,6 +114,7 @@ + port = netloc.split(":", 1)[1] + return int(port, 10) + return None ++ port = property(port) + + + class SplitResult(BaseResult): +@@ -137,9 +137,9 @@ + return BaseResult.__new__( + cls, (scheme, netloc, path, params, query, fragment)) + +- @property + def params(self): + return self[3] ++ params = property(params) + + def geturl(self): + return urlunparse(self) diff --git a/duplicity.spec b/duplicity.spec index 8b6dc56..0c996f8 100644 --- a/duplicity.spec +++ b/duplicity.spec @@ -2,18 +2,19 @@ Summary: Encrypted bandwidth-efficient backup using rsync algorithm Name: duplicity -Version: 0.4.3 +Version: 0.4.9 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 -Requires: python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6 -Requires: pexpect >= 2.1, openssh-clients, rsync, ncftp, python-boto >= 0.9b +Patch: duplicity-0.4.9-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 %if 0%{?rhel} <= 4 Requires: python-abi = %(%{__python} -c "import sys; print sys.version[:3]") %endif -BuildRequires: python-devel >= 2.2, librsync-devel >= 0.9.6, pexpect >= 2.1 +BuildRequires: python-devel >= 2.3, librsync-devel >= 0.9.6, pexpect >= 2.1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -31,6 +32,7 @@ but not hard links. %prep %setup -q +%patch -p1 -b .python23 %build %{__python} setup.py build @@ -49,11 +51,15 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/%{name} %{_mandir}/man1/%{name}* %{_mandir}/man1/rdiffdir* -%dir %{python_sitearch}/%{name} -%{python_sitearch}/%{name}/*.py* -%{python_sitearch}/%{name}/*.so +%{python_sitearch}/%{name}* %changelog +* Sun Feb 10 2008 Robert Scheck 0.4.9-1 +- Upgrade to 0.4.9 (#293081, #431467) + +* Sat Dec 08 2007 Robert Scheck 0.4.7-1 +- Upgrade to 0.4.7 + * Sat Sep 15 2007 Robert Scheck 0.4.3-1 - Upgrade to 0.4.3 (#265701) - Updated the license tag according to the guidelines diff --git a/sources b/sources index c4f3f78..2545d48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fc615a1bf173fb55c36c502d252583f8 duplicity-0.4.3.tar.gz +501f613e8c76bf69e161d82bbb2d7a05 duplicity-0.4.9.tar.gz