Hello community, here is the log from the commit of package rdiff-backup for openSUSE:Factory checked in at 2015-03-18 13:05:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rdiff-backup (Old) and /work/SRC/openSUSE:Factory/.rdiff-backup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rdiff-backup" Changes: -------- --- /work/SRC/openSUSE:Factory/rdiff-backup/rdiff-backup.changes 2014-11-05 15:55:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rdiff-backup.new/rdiff-backup.changes 2015-03-18 13:06:00.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Mar 16 16:29:25 UTC 2015 - [email protected] + +- Add rdiff-backup-librsync-1.0.patch: Fix build with + librsync 1.0.0. + +------------------------------------------------------------------- +Fri Mar 13 12:25:51 UTC 2015 - [email protected] + +- Cleanup spec file with spec-cleaner +- Add gpg signature + +------------------------------------------------------------------- Old: ---- rdiff-backup-1.2.8.tar.bz2 New: ---- rdiff-backup-1.2.8.tar.gz rdiff-backup-1.2.8.tar.gz.asc rdiff-backup-librsync-1.0.patch rdiff-backup.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rdiff-backup.spec ++++++ --- /var/tmp/diff_new_pack.LMGnuY/_old 2015-03-18 13:06:01.000000000 +0100 +++ /var/tmp/diff_new_pack.LMGnuY/_new 2015-03-18 13:06:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rdiff-backup # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,19 @@ Name: rdiff-backup +Version: 1.2.8 +Release: 0 Summary: Convenient and transparent local/remote incremental mirror/backup License: GPL-2.0+ Group: Productivity/Archiving/Backup -Version: 1.2.8 -Release: 0 Url: http://www.nongnu.org/rdiff-backup/ -Source0: http://savannah.nongnu.org/download/rdiff-backup/%{name}-%{version}.tar.bz2 +Source0: http://savannah.nongnu.org/download/rdiff-backup/%{name}-%{version}.tar.gz +Source1: http://savannah.nongnu.org/download/rdiff-backup/%{name}-%{version}.tar.gz.asc +Source2: %{name}.keyring Patch0: rdiff-backup-fix-deprecations.diff # well, upstream is apparently dead, but I found this patch on the upstream mailing list. # PATCH-FEATURE-UPSTREAM rdiff-backup-1.2.8-sparsefiles.diff -- [email protected] Patch1: rdiff-backup-1.2.8-sparsefiles.diff -# the above patch is slightly broken, fix it by not using sparse code when writing -# compressed files -# PATCH-FIX-OPENSUSE rdiff-backup-1.2.8-sparse-no-seek-in-gzip.diff [email protected] -Patch11: rdiff-backup-1.2.8-sparse-no-seek-in-gzip.diff # in order not stumble on handle hardlinks, these two patches are necessary # http://savannah.nongnu.org/bugs/?26848 # PATCH-FEATURE-UPSTREAM Hardlink.py.revised-patch compare.py.patch -- [email protected] @@ -41,16 +39,22 @@ # backups with --remove-older-than xB, while keeping empty/useless sessions instead # patch is not upstream -- [email protected] Patch4: rdiff-backup-dont-pick-empty-sessions.diff +# the above patch is slightly broken, fix it by not using sparse code when writing +# compressed files +# PATCH-FIX-OPENSUSE rdiff-backup-1.2.8-sparse-no-seek-in-gzip.diff [email protected] +Patch11: rdiff-backup-1.2.8-sparse-no-seek-in-gzip.diff +# PATCH-FIX-UPSTREAM rdiff-backup-librsync-1.0.patch [email protected] -- Fix build with librsync 1.0.0 +Patch12: rdiff-backup-librsync-1.0.patch +BuildRequires: python-devel +Recommends: python-pylibacl +Recommends: python-xattr BuildRoot: %{_tmppath}/%{name}-%{version}-build +%py_requires %if 0%{?suse_version} > 1210 BuildRequires: librsync-devel %else BuildRequires: librsync %endif -BuildRequires: python-devel -Recommends: python-xattr -Recommends: python-pylibacl -%py_requires %description rdiff-backup backs up one directory to another, possibly over a @@ -66,31 +70,23 @@ transmitted. Finally, rdiff-backup is easy to use and settings have sensical defaults. - - -Authors: --------- - Ben Escoto <[email protected]> - %prep %setup -q %patch0 -p1 %patch1 -p1 %patch11 -p1 -%patch2 -p0 -%patch3 -p0 +%patch2 +%patch3 %patch4 -p1 +%patch12 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%{optflags}" python setup.py build %install -python setup.py install --prefix=%{_prefix} --root $RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT/usr/share/doc/rdiff-backup-%{version} - -%clean -rm -rf $RPM_BUILD_ROOT +python setup.py install --prefix=%{_prefix} --root %{buildroot} +rm -rf %{buildroot}%{_datadir}/doc/rdiff-backup-%{version} %files %defattr(-, root, root) @@ -98,8 +94,6 @@ %{_mandir}/*/* %{_bindir}/* %{py_sitedir}/rdiff_backup -%if %{suse_version} > 1010 %{py_sitedir}/*.egg-info -%endif %changelog ++++++ rdiff-backup-librsync-1.0.patch ++++++ Index: rdiff-backup-1.2.8/_librsyncmodule.c =================================================================== --- rdiff-backup-1.2.8.orig/_librsyncmodule.c +++ rdiff-backup-1.2.8/_librsyncmodule.c @@ -59,8 +59,14 @@ _librsync_new_sigmaker(PyObject* self, P if (sm == NULL) return NULL; sm->x_attr = NULL; +#ifdef RS_DEFAULT_STRONG_LEN /* librsync < 1.0.0 */ sm->sig_job = rs_sig_begin((size_t)blocklen, (size_t)RS_DEFAULT_STRONG_LEN); +#else /* librsync >= 1.0.0 */ + sm->sig_job = rs_sig_begin((size_t)blocklen, + (size_t)8, RS_MD4_SIG_MAGIC); +#endif + return (PyObject*)sm; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
