From 39dcb280414f929ce4c665a6925400285f34e4e03e35283b5e94f7e70b4997ae Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 16 Feb 2021 15:30:52 +0000 Subject: [PATCH] Accepting request 872712 from home:msmeissn:branches:server:database this resyncs SLES changes - Enable TLS support and add BuildRequires libopenssl-devel (bsc#1181830) - Make tests run by adding BuildRequires tcl and procps OBS-URL: https://build.opensuse.org/request/show/872712 OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=162 --- redis.changes | 6 ++++++ redis.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/redis.changes b/redis.changes index c2ebdf4..80df4ae 100644 --- a/redis.changes +++ b/redis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 12 23:30:08 UTC 2021 - Jan Zerebecki + +- Enable TLS support and add BuildRequires libopenssl-devel (bsc#1181830) +- Make tests run by adding BuildRequires tcl and procps + ------------------------------------------------------------------- Tue Jan 12 20:05:52 UTC 2021 - Michael Ströder diff --git a/redis.spec b/redis.spec index 0dc2fe5..835cc97 100644 --- a/redis.spec +++ b/redis.spec @@ -41,11 +41,15 @@ Patch0: %{name}-conf.patch Patch1: getMcontextEip-return-value.patch Patch3: reproducible.patch Patch4: ppc-atomic.patch +BuildRequires: libopenssl-devel BuildRequires: pkgconfig +BuildRequires: procps BuildRequires: sysuser-shadow BuildRequires: sysuser-tools +BuildRequires: tcl BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(systemd) +# there is no tcl-tls package yet, which is said to be needed for testing tls support Recommends: logrotate %sysusers_requires @@ -67,7 +71,7 @@ echo "`grep -F %{name}-%{version}.tar.gz %{SOURCE10} | cut -d' ' -f4` %{SOURCE0 %build export HOST=OBS # for reproducible builds -%make_build CFLAGS="%{optflags}" BUILD_WITH_SYSTEMD=yes +%make_build CFLAGS="%{optflags}" BUILD_WITH_SYSTEMD=yes BUILD_TLS=yes %sysusers_generate_pre %{SOURCE9} redis %install @@ -116,7 +120,8 @@ The test suite often fails to start a server, with 'child process exited abnormally' -- sometimes it works. --------------------------------------------------- EOF -%make_build test || true +# Variable assignments need to match in all make invocations, otherwise it might recomplie. See https://github.com/redis/redis/issues/7337 +%make_build test CFLAGS="%{optflags}" BUILD_WITH_SYSTEMD=yes BUILD_TLS=yes || true %pre -f redis.pre %service_add_pre redis.target redis@.service redis-sentinel.target redis-sentinel@.service