From 8f89520ea7bc8e0200321f6996c7ea7b9e1d6410f1078917ab667695b11fdcc8 Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Fri, 15 Nov 2013 12:09:19 +0000 Subject: [PATCH 1/3] Don't try to BuildRequire texlive-nopageno on openSUSE <= 12.2 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/csync2?expand=0&rev=35 --- csync2.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/csync2.spec b/csync2.spec index d8f8620..0ad4f28 100644 --- a/csync2.spec +++ b/csync2.spec @@ -59,7 +59,9 @@ BuildRequires: systemd %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 From f27cd09b8df8d13401fd7e30fd1a4712d4fd535125450ccff7006040d381c2a6 Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Fri, 15 Nov 2013 12:21:08 +0000 Subject: [PATCH 2/3] Fix stupid macro typo OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/csync2?expand=0&rev=36 --- csync2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csync2.spec b/csync2.spec index 0ad4f28..00e9381 100644 --- a/csync2.spec +++ b/csync2.spec @@ -59,7 +59,7 @@ BuildRequires: systemd %endif # texlive is for pdflatex to build PDF version of the manual BuildRequires: texlive-latex -%if 0%{?suse_version > 1220 +%if 0%{?suse_version} > 1220 BuildRequires: texlive-nopageno %endif From 27bc9576df48848eec706f9e5fc89d895a07ef16a5ad05a4c2d775fd8e73db77 Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Thu, 26 Mar 2015 11:40:59 +0000 Subject: [PATCH 3/3] Accepting request 293252 from home:dimstar:Factory - Add csync2-librsync-1.0.0.patch: Fix build with librsync 1.0.0. OBS-URL: https://build.opensuse.org/request/show/293252 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/csync2?expand=0&rev=37 --- csync2-librsync-1.0.0.patch | 16 ++++++++++++++++ csync2.changes | 5 +++++ csync2.spec | 5 ++++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 csync2-librsync-1.0.0.patch diff --git a/csync2-librsync-1.0.0.patch b/csync2-librsync-1.0.0.patch new file mode 100644 index 0000000..3d23037 --- /dev/null +++ b/csync2-librsync-1.0.0.patch @@ -0,0 +1,16 @@ +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) diff --git a/csync2.changes b/csync2.changes index 3ea0d0b..400ddfc 100644 --- a/csync2.changes +++ b/csync2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 26 11:25:01 UTC 2015 - dimstar@opensuse.org + +- Add csync2-librsync-1.0.0.patch: Fix build with librsync 1.0.0. + ------------------------------------------------------------------- Thu Sep 26 09:07:40 UTC 2013 - tserong@suse.com diff --git a/csync2.spec b/csync2.spec index 00e9381..886b268 100644 --- a/csync2.spec +++ b/csync2.spec @@ -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 @@ Patch11: fix-csync2_ssl_cert-filename.patch Patch12: fix-sonames.patch # PATCH-FIX-UPSTREAM -- add-COPYING.patch tserong@suse.com -- ensure COPYING is present in docfiles and thus %doc Patch13: add-COPYING.patch +# PATCH-FIX-UPSTREAM csync2-librsync-1.0.0.patch dimstar@opensuse.org -- Fix build with librsync 1.0.0 +Patch14: csync2-librsync-1.0.0.patch BuildRequires: autoconf BuildRequires: automake @@ -80,6 +82,7 @@ It is expedient for HA-clusters, HPC-clusters, COWs and server farms. %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build export CFLAGS="%{optflags}"