Hello community, here is the log from the commit of package duplicity for openSUSE:Factory checked in at 2015-03-16 09:41:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/duplicity (Old) and /work/SRC/openSUSE:Factory/.duplicity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "duplicity" Changes: -------- --- /work/SRC/openSUSE:Factory/duplicity/duplicity.changes 2015-03-03 11:14:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.duplicity.new/duplicity.changes 2015-03-16 09:41:13.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 5 21:41:25 UTC 2015 - [email protected] + +- Add duplicity-librsync-1.0.patch: Fix build with librsync 1.0.0. + +------------------------------------------------------------------- New: ---- duplicity-librsync-1.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ duplicity.spec ++++++ --- /var/tmp/diff_new_pack.MLdvLO/_old 2015-03-16 09:41:14.000000000 +0100 +++ /var/tmp/diff_new_pack.MLdvLO/_new 2015-03-16 09:41:14.000000000 +0100 @@ -28,6 +28,8 @@ Source: https://code.launchpad.net/%{name}/0.7-series/%{version}/+download/%{name}-%{version}.tar.gz Source99: duplicity-rpmlintrc Patch1: duplicity-remove_shebang.patch +# PATCH-FIX-UPSTREAM duplicity-librsync-1.0.patch lp#1416344 [email protected] -- Fix build with librsync 1.0.0, taken from upstream +Patch2: duplicity-librsync-1.0.patch BuildRequires: python-devel BuildRequires: python-setuptools Requires: gpg @@ -57,6 +59,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build python setup.py build ++++++ duplicity-librsync-1.0.patch ++++++ Index: duplicity-0.7.01/duplicity/_librsyncmodule.c =================================================================== --- duplicity-0.7.01.orig/duplicity/_librsyncmodule.c +++ duplicity-0.7.01/duplicity/_librsyncmodule.c @@ -58,8 +58,13 @@ _librsync_new_sigmaker(PyObject* self, P sm = PyObject_New(_librsync_SigMakerObject, &_librsync_SigMakerType); if (sm == NULL) return 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]
