From 2bc1e2ae43805e05be97365fe1231128c9497b243dd152647e1eae2d76e96514 Mon Sep 17 00:00:00 2001 From: David Anes Date: Wed, 6 Sep 2023 09:58:37 +0000 Subject: [PATCH] Accepting request 1109229 from home:kukuk:branches:network - Use "slp" for bcond, not "openslp", like we use for all other packages, too. - Disable slp patch and configure option if bcond slp is disabled. OBS-URL: https://build.opensuse.org/request/show/1109229 OBS-URL: https://build.opensuse.org/package/show/network/rsync?expand=0&rev=109 --- rsync.changes | 7 +++++++ rsync.spec | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/rsync.changes b/rsync.changes index 23de69c..d965750 100644 --- a/rsync.changes +++ b/rsync.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 6 09:19:36 UTC 2023 - Thorsten Kukuk + +- Use "slp" for bcond, not "openslp", like we use for all other + packages, too. +- Disable slp patch and configure option if bcond slp is disabled. + ------------------------------------------------------------------- Tue Sep 5 12:07:57 UTC 2023 - Dirk Müller diff --git a/rsync.spec b/rsync.spec index cd28911..6df139c 100644 --- a/rsync.spec +++ b/rsync.spec @@ -29,9 +29,9 @@ %endif %if 0%{?suse_version} < 1600 -%bcond_without openslp +%bcond_without slp %else -%bcond_with openslp +%bcond_with slp %endif Name: rsync @@ -72,7 +72,7 @@ BuildRequires: pkgconfig(libxxhash) >= 0.8.0 %if %{with gcc11} BuildRequires: gcc11-c++ %endif -%if %{with openslp} +%if %{with slp} BuildRequires: openslp-devel %endif BuildRequires: pkgconfig(openssl) @@ -94,7 +94,9 @@ for backups and mirroring and as an improved copy command for everyday use. %setup -q -b 1 rm -f zlib/*.h zlib/*.c +%if %{with slp} patch -p1 < patches/slp.diff +%endif %autopatch -p1 @@ -117,7 +119,9 @@ export LDFLAGS="-Wl,-z,relro,-z,now -fPIE -pie" %ifarch x86_64 --enable-simd \ %endif +%if %{with slp} --enable-slp \ +%endif --enable-acl-support \ --enable-xattr-support %make_build reconfigure