commit 04e8b5d5fee60daca270d2a11ca13e120bf1286c
Author: Jan Rękorajski <[email protected]>
Date: Mon Sep 11 16:41:22 2023 +0200
- up to 2.2.6
hardlinks.patch | 18 ----------------
librsync.patch | 20 ------------------
rdiff-backup.spec | 62 +++++++++++++++++++++++++++++++++++--------------------
3 files changed, 40 insertions(+), 60 deletions(-)
---
diff --git a/rdiff-backup.spec b/rdiff-backup.spec
index d352701..b4a2257 100644
--- a/rdiff-backup.spec
+++ b/rdiff-backup.spec
@@ -2,22 +2,21 @@ Summary: Backup software
Summary(hu.UTF-8): Backup szoftver
Summary(pl.UTF-8): Oprogramowanie do robienia kopii zapasowych
Name: rdiff-backup
-Version: 1.2.8
-Release: 6
+Version: 2.2.6
+Release: 1
License: GPL
Group: Networking/Utilities
-Source0:
http://download.savannah.gnu.org/releases-noredirect/rdiff-backup/%{name}-%{version}.tar.gz
-# Source0-md5: 1a94dc537fcf74d6a3a80bd27808e77b
-Patch0: librsync.patch
-Patch1: hardlinks.patch
+Source0:
https://files.pythonhosted.org/packages/source/r/rdiff-backup/%{name}-%{version}.tar.gz
+# Source0-md5: cc055b501f004c1828664755ae039c28
URL: http://www.nongnu.org/rdiff-backup/
BuildRequires: librsync-devel >= 0.9.7-5
BuildRequires: popt-devel
-BuildRequires: python-devel >= 1:2.5
+BuildRequires: python3-devel >= 1:3.6
+BuildRequires: python3-setuptools_scm
BuildRequires: rpm-pythonprov
-%pyrequires_eq python-modules
-Requires: python-pylibacl
-Requires: python-pyxattr >= 0.4.0
+%pyrequires_eq python3-modules
+Requires: python3-pylibacl
+Requires: python3-pyxattr >= 0.4.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -56,34 +55,53 @@ przyjaznym dla łącza umożliwiając backup przez sieć z
wykorzystaniem
bezpiecznego połączenia SSH, gdzie jedynymi przesyłanymi danymi będą
różnice w stosunku do poprzedniej kopii zapasowej.
+%package -n bash-completion-rdiff-backup
+Summary: bash-completion for rdiff-backup commands
+Summary(pl.UTF-8): Bashowe uzupełnianie poleceń rdiff-backup
+Group: Applications/Shells
+Requires: bash-completion >= 2.0
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description -n bash-completion-rdiff-backup
+bash-completion for rdiff-backup commands.
+
+%description -n bash-completion-rdiff-backup -l pl.UTF-8
+Bashowe uzupełnianie poleceń rdiff-backup.
+
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
-%py_build
+%py3_build
%install
rm -rf $RPM_BUILD_ROOT
-%py_install
+%py3_install
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
-%py_postclean
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc CHANGELOG README FAQ.html examples.html
+%doc CHANGELOG.adoc README.adoc docs/FAQ.adoc docs/examples.adoc
%attr(755,root,root) %{_bindir}/rdiff-backup
+%attr(755,root,root) %{_bindir}/rdiff-backup-delete
%attr(755,root,root) %{_bindir}/rdiff-backup-statistics
%{_mandir}/man1/rdiff-backup.1*
%{_mandir}/man1/rdiff-backup-statistics.1*
-%{py_sitedir}/rdiff_backup*.egg-info
-%dir %{py_sitedir}/rdiff_backup
-%{py_sitedir}/rdiff_backup/*.py[co]
-%attr(755,root,root) %{py_sitedir}/rdiff_backup/*.so
+%{py3_sitedir}/rdiff_backup*.egg-info
+%dir %{py3_sitedir}/rdiff_backup
+%{py3_sitedir}/rdiff_backup/__pycache__
+%{py3_sitedir}/rdiff_backup/*.py
+%attr(755,root,root) %{py3_sitedir}/rdiff_backup/*.so
+%{py3_sitedir}/rdiffbackup
+%{_mandir}/man1/rdiff-backup-delete.1*
+%{_mandir}/man1/rdiff-backup-old.1*
+
+%files -n bash-completion-rdiff-backup
+%defattr(644,root,root,755)
+%{bash_compdir}/rdiff-backup
diff --git a/hardlinks.patch b/hardlinks.patch
deleted file mode 100644
index 40085c6..0000000
--- a/hardlinks.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur rdiff-backup-1.2.8.orig/rdiff_backup/backup.py
rdiff-backup-1.2.8/rdiff_backup/backup.py
---- rdiff-backup-1.2.8.orig/rdiff_backup/backup.py 2009-03-16
08:36:21.000000000 -0600
-+++ rdiff-backup-1.2.8/rdiff_backup/backup.py 2017-01-08 10:29:55.417206386
-0700
-@@ -555,8 +555,12 @@
- elif result == 2: return 1 # SpecialFile
- elif not self.patch_diff_to_temp(basis_rp, diff_rorp, new):
- return 0
-- if new.lstat() and not diff_rorp.isflaglinked():
-- rpath.copy_attribs(diff_rorp, new)
-+ if new.lstat():
-+ if diff_rorp.isflaglinked():
-+ if Globals.eas_write:
-+ new.data['ea'] = diff_rorp.get_ea()
-+ else:
-+ rpath.copy_attribs(diff_rorp, new)
- return self.matches_cached_rorp(diff_rorp, new)
-
- def patch_hardlink_to_temp(self, diff_rorp, new):
diff --git a/librsync.patch b/librsync.patch
deleted file mode 100644
index ce23c8a..0000000
--- a/librsync.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Patch by Roman Tereshonkov and Kari Hautio for rdiff-backup <= 1.2.8 to avoid
a build failure with
-librsync >= 1.0.0 (which is a security bugfix release). The discussion and
solution finding can be
-found at https://bugs.launchpad.net/duplicity/+bug/1416344 (for duplicity).
-
---- rdiff-backup-1.2.8/_librsyncmodule.c 2009-03-16
15:36:21.000000000 +0100
-+++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0
2015-03-02 00:54:24.000000000 +0100
-@@ -59,8 +59,13 @@
- if (sm == NULL) return NULL;
- sm->x_attr = NULL;
-
-+#ifdef RS_DEFAULT_STRONG_LEN
- sm->sig_job = rs_sig_begin((size_t)blocklen,
-
(size_t)RS_DEFAULT_STRONG_LEN);
-+#else
-+ sm->sig_job = rs_sig_begin((size_t)blocklen,
-+ (size_t)8,
RS_MD4_SIG_MAGIC);
-+#endif
- return (PyObject*)sm;
- }
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rdiff-backup.git/commitdiff/04e8b5d5fee60daca270d2a11ca13e120bf1286c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
