[packages/duplicity] - rediff patches - fix shebangs - rel 2
baggins
baggins at pld-linux.org
Thu Mar 4 22:42:27 CET 2021
commit cb68b1e2a6110d135c226f07b1d47b3faba330b1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Mar 4 22:42:04 2021 +0100
- rediff patches
- fix shebangs
- rel 2
duplicity-backend-search.patch | 9 +++++----
duplicity.spec | 6 +++++-
2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/duplicity.spec b/duplicity.spec
index 45b2a7f..cf15993 100644
--- a/duplicity.spec
+++ b/duplicity.spec
@@ -3,7 +3,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: 1
+Release: 2
License: GPL v2
Group: Applications/Archiving
Source0: http://code.launchpad.net/duplicity/%{mainver}-series/%{version}/+download/%{name}-%{version}.tar.gz
@@ -51,6 +51,10 @@ nie twarde dowiązania.
%setup -q
%patch0 -p1
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' \
+ bin/duplicity \
+ bin/rdiffdir \
+
%build
%py_build
diff --git a/duplicity-backend-search.patch b/duplicity-backend-search.patch
index aa9194a..cc3d325 100644
--- a/duplicity-backend-search.patch
+++ b/duplicity-backend-search.patch
@@ -1,8 +1,9 @@
---- duplicity-0.6.08a-orig/duplicity/backend.py 2010-03-11 15:08:30.000000000 +0100
-+++ duplicity-0.6.08a/duplicity/backend.py 2010-03-11 17:13:41.195614937 +0100
-@@ -68,8 +68,8 @@
-
+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]
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/duplicity.git/commitdiff/cb68b1e2a6110d135c226f07b1d47b3faba330b1
More information about the pld-cvs-commit
mailing list