Accepting request 872866 from server:database

OBS-URL: https://build.opensuse.org/request/show/872866
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/redis?expand=0&rev=64
This commit is contained in:
Dominique Leuenberger 2021-02-23 19:18:03 +00:00 committed by Git OBS Bridge
commit cb34d52d51
2 changed files with 13 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Feb 12 23:30:08 UTC 2021 - Jan Zerebecki <jzerebecki@suse.com>
- 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 <michael@stroeder.com> Tue Jan 12 20:05:52 UTC 2021 - Michael Ströder <michael@stroeder.com>

View File

@ -41,11 +41,15 @@ Patch0: %{name}-conf.patch
Patch1: getMcontextEip-return-value.patch Patch1: getMcontextEip-return-value.patch
Patch3: reproducible.patch Patch3: reproducible.patch
Patch4: ppc-atomic.patch Patch4: ppc-atomic.patch
BuildRequires: libopenssl-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: procps
BuildRequires: sysuser-shadow BuildRequires: sysuser-shadow
BuildRequires: sysuser-tools BuildRequires: sysuser-tools
BuildRequires: tcl
BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
# there is no tcl-tls package yet, which is said to be needed for testing tls support
Recommends: logrotate Recommends: logrotate
%sysusers_requires %sysusers_requires
@ -67,7 +71,7 @@ echo "`grep -F %{name}-%{version}.tar.gz %{SOURCE10} | cut -d' ' -f4` %{SOURCE0
%build %build
export HOST=OBS # for reproducible builds 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 %sysusers_generate_pre %{SOURCE9} redis
%install %install
@ -116,7 +120,8 @@ The test suite often fails to start a server, with
'child process exited abnormally' -- sometimes it works. 'child process exited abnormally' -- sometimes it works.
--------------------------------------------------- ---------------------------------------------------
EOF 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 %pre -f redis.pre
%service_add_pre redis.target redis@.service redis-sentinel.target redis-sentinel@.service %service_add_pre redis.target redis@.service redis-sentinel.target redis-sentinel@.service