Hello community, here is the log from the commit of package csync2 for openSUSE:Factory checked in at 2015-03-28 18:38:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/csync2 (Old) and /work/SRC/openSUSE:Factory/.csync2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "csync2" Changes: -------- --- /work/SRC/openSUSE:Factory/csync2/csync2.changes 2013-10-11 08:53:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.csync2.new/csync2.changes 2015-03-28 18:38:41.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 26 11:25:01 UTC 2015 - [email protected] + +- Add csync2-librsync-1.0.0.patch: Fix build with librsync 1.0.0. + +------------------------------------------------------------------- New: ---- csync2-librsync-1.0.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ csync2.spec ++++++ --- /var/tmp/diff_new_pack.mpGoMg/_old 2015-03-28 18:38:41.000000000 +0100 +++ /var/tmp/diff_new_pack.mpGoMg/_new 2015-03-28 18:38:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package csync2 # -# Copyright (c) 2013 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 @@ -40,6 +40,8 @@ Patch12: fix-sonames.patch # PATCH-FIX-UPSTREAM -- add-COPYING.patch [email protected] -- ensure COPYING is present in docfiles and thus %doc Patch13: add-COPYING.patch +# PATCH-FIX-UPSTREAM csync2-librsync-1.0.0.patch [email protected] -- Fix build with librsync 1.0.0 +Patch14: csync2-librsync-1.0.0.patch BuildRequires: autoconf BuildRequires: automake @@ -59,7 +61,9 @@ %endif # texlive is for pdflatex to build PDF version of the manual BuildRequires: texlive-latex +%if 0%{?suse_version} > 1220 BuildRequires: texlive-nopageno +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -78,6 +82,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build export CFLAGS="%{optflags}" ++++++ csync2-librsync-1.0.0.patch ++++++ Index: csync2-2.0+git.1368794815.cf835a7/rsync.c =================================================================== --- csync2-2.0+git.1368794815.cf835a7.orig/rsync.c +++ csync2-2.0+git.1368794815.cf835a7/rsync.c @@ -461,7 +461,11 @@ int csync_rs_sigfile(const char *filenam goto out; csync_debug(3, "Running rs_sig_file() from librsync....\n"); +#ifdef RS_DEFAULT_STRONG_LEN result = rs_sig_file(basis_file, sig_file, RS_DEFAULT_BLOCK_LEN, RS_DEFAULT_STRONG_LEN, &stats); +#else + result = rs_sig_file(basis_file, sig_file, RS_DEFAULT_BLOCK_LEN, 8, RS_MD4_SIG_MAGIC, &stats); +#endif *sig_file_out = sig_file; sig_file = NULL; if (result != RS_DONE) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
