- up to 2.1.1

diff --git a/duplicity-backend-search.patch b/duplicity-backend-search.patch
deleted file mode 100644 (file)
index cc3d325..0000000
--- a/duplicity-backend-search.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urNp -x '*.orig' duplicity-0.7.18.2.org/duplicity/backend.py duplicity-0.7.18.2/duplicity/backend.py
---- duplicity-0.7.18.2.org/duplicity/backend.py        2017-11-23 14:07:34.000000000 +0100
-+++ duplicity-0.7.18.2/duplicity/backend.py    2021-03-04 22:40:10.513136774 +0100
-@@ -91,8 +91,8 @@ def import_backends():
-     files = os.listdir(path)
-     files.sort()
-     for fn in files:
--        if fn.endswith("backend.py"):
--            fn = fn[:-3]
-+        if fn.endswith("backend.pyc"):
-+            fn = fn[:-4]
-             imp = "duplicity.backends.%s" % (fn,)
-             try:
-                 __import__(imp)

diff --git a/duplicity-pexpect.patch b/duplicity-pexpect.patch
deleted file mode 100644 (file)
index df9c780..0000000
--- a/duplicity-pexpect.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- duplicity-0.6.19/duplicity/backends/_ssh_pexpect.py.orig   2012-06-22 22:04:38.879374844 +0200
-+++ duplicity-0.6.19/duplicity/backends/_ssh_pexpect.py        2012-06-22 22:04:47.079330420 +0200
-@@ -32,7 +32,7 @@ import os
- import duplicity.backend
- from duplicity import globals
- from duplicity import log
--from duplicity import pexpect
-+import pexpect
- from duplicity.errors import * #@UnusedWildImport
- 
- class SSHPExpectBackend(duplicity.backend.Backend):

diff --git a/duplicity.spec b/duplicity.spec
index d230919701b354efb16f1d08bea26fbdc88da1ee..44b9e44e87f311af874996efa26d198e256e04db 100644 (file)
--- a/duplicity.spec
+++ b/duplicity.spec
@@ -1,28 +1,26 @@
-%define                mainver 0.7
 Summary:       Untrusted/encrypted backup using rsync algorithm
 Summary(pl.UTF-8):     Wykonywanie szyfrowanych kopii zapasowych przy użyciu algorytmu rsync
 Name:          duplicity
-Version:       %{mainver}.18.2
-Release:       3
+Version:       2.1.1
+Release:       1
 License:       GPL v2
 Group:         Applications/Archiving
-Source0:       http://code.launchpad.net/duplicity/%{mainver}-series/%{version}/+download/%{name}-%{version}.tar.gz
-# Source0-md5: a5d16cc0a95f0fd2bb309cd0b8015945
-Patch0:                %{name}-backend-search.patch
+Source0:       https://gitlab.com/duplicity/duplicity/-/archive/rel.%{version}/%{name}-rel.%{version}.tar.bz2
+# Source0-md5: 7064f8a6b176a8d095406509ddf5451a
 URL:           http://www.nongnu.org/duplicity/
 BuildRequires: rpmbuild(macros) >= 1.710
 BuildRequires: librsync-devel >= 0.9.6
-BuildRequires: python-devel >= 1:2.3
-BuildRequires: python-modules
+BuildRequires: python3-devel
+BuildRequires: python3-modules
 BuildRequires: rpm-pythonprov
 Requires:      gnupg
-Requires:      python >= 1:2.3
-Requires:      python-lockfile
-Requires:      python-modules
-Requires:      python-pexpect >= 2.1
+Requires:      python3
+Requires:      python3-lockfile
+Requires:      python3-modules
+Requires:      python3-pexpect >= 2.1
 Suggests:      lftp
 Suggests:      ncftp
-Suggests:      python-boto >= 0.9d
+Suggests:      python3-boto >= 0.9d
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,28 +46,21 @@ uprawnień, katalogi, dowiązania symboliczne, nazwane potoki itp. - ale
 nie twarde dowiązania.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-rel.%{version}
 
-%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' \
-      bin/duplicity \
-      bin/rdiffdir \
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
+      bin/duplicity
 
 %build
-%py_build
+%py3_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%py_install
-
-# Remove %{_datadir}/locale/io/LC_MESSAGES. It's not yet supported.
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/io
+%py3_install
 
 %{__rm} -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
-%py_postclean
-
 %find_lang %{name}
 
 %clean
@@ -77,16 +68,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc CHANGELOG README
+%doc CHANGELOG.md README*.md
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*.1*
-%dir %{py_sitedir}/duplicity
-%dir %{py_sitedir}/duplicity/backends
-%dir %{py_sitedir}/duplicity/backends/pyrax_identity
-%{py_sitedir}/duplicity/*.py[co]
-%{py_sitedir}/duplicity/backends/*.py[co]
-%{py_sitedir}/duplicity/backends/pyrax_identity/*.py[co]
-%attr(755,root,root) %{py_sitedir}/duplicity/*.so
-%if "%{pld_release}" != "ac"
-%{py_sitedir}/duplicity-*.egg-info
-%endif
+%dir %{py3_sitedir}/duplicity
+%dir %{py3_sitedir}/duplicity/backends
+%dir %{py3_sitedir}/duplicity/backends/pyrax_identity
+%{py3_sitedir}/duplicity/__pycache__
+%{py3_sitedir}/duplicity/*.py
+%{py3_sitedir}/duplicity/backends/__pycache__
+%{py3_sitedir}/duplicity/backends/*.py
+%{py3_sitedir}/duplicity/backends/pyrax_identity/__pycache__
+%{py3_sitedir}/duplicity/backends/pyrax_identity/*.py
+%attr(755,root,root) %{py3_sitedir}/duplicity/*.so
+%{py3_sitedir}/duplicity-*.egg-info