redis downgrade to 5.0.8

Signed-off-by: nosqlbuilder_pel7x64builder0 <nosqlbuilder@powerel.org>

SOURCES/redis-limit-systemd

@@ -1,14 +1,7 @@
 # If you need to change max open file limit
 # for example, when you change maxclient in configuration
-# you can change the LimitNOFILE value below.
+# you can change the LimitNOFILE value below
-# See "man systemd.exec" for more information.
+# see "man systemd.exec" for information
-
-# Slave nodes on large system may take lot of time to start.
-# You may need to uncomment TimeoutStartSec and TimeoutStopSec
-# directives below and raise their value.
-# See "man systemd.service" for more information.
 
 [Service]
 LimitNOFILE=10240
-#TimeoutStartSec=90s
-#TimeoutStopSec=90s

SOURCES/redis-sentinel.service

@@ -5,7 +5,7 @@ After=network-online.target
 Wants=network-online.target
 
 [Service]
-ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --daemonize no --supervised systemd
+ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --supervised systemd
 ExecStop=/usr/libexec/redis-shutdown redis-sentinel
 Type=notify
 User=redis

SOURCES/redis.service

@@ -5,7 +5,7 @@ After=network-online.target
 Wants=network-online.target
 
 [Service]
-ExecStart=/usr/bin/redis-server /etc/redis.conf --daemonize no --supervised systemd
+ExecStart=/usr/bin/redis-server /etc/redis.conf --supervised systemd
 ExecStop=/usr/libexec/redis-shutdown
 Type=notify
 User=redis

SPECS/redis.spec

@@ -12,14 +12,14 @@
 
 # Commit IDs for the (unversioned) redis-doc repository
 # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
-%global doc_commit f092dd3227cc74978853e379c0a7731bdaa324af
+%global doc_commit 3a41bc371a894cf63af99046f61052614379f7b0
 %global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7})
 
 # %%{rpmmacrodir} not usable on EL-6
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:              redis
-Version:           6.0.5
+Version:           5.0.8
 Release:           1%{?dist}
 Summary:           A persistent key-value database
 # redis, linenoise, lzf, hiredis are BSD
@@ -48,16 +48,12 @@ Source10:          https://github.com/antirez/%{name}-doc/archive/%{doc_commit}/
 Patch0001:         0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
 # https://github.com/antirez/redis/pull/3494 - symlink
 Patch0002:         0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch
-# https://github.com/antirez/redis/pull/7168 - notify systemd
-Patch0003:         0003-Notify-systemd-on-sentinel-startup.patch
 BuildRequires:     gcc
 %if 0%{?with_tests}
 BuildRequires:     procps-ng
 BuildRequires:     tcl
 %endif
-BuildRequires:     pkgconfig(libsystemd)
+BuildRequires:     systemd
-BuildRequires:     systemd-devel
-BuildRequires:     openssl-devel
 # redis-trib functionality migrated to redis-cli
 Obsoletes:         redis-trib < 5
 # Required for redis-shutdown
@@ -129,7 +125,6 @@ administration and development.
 mv ../%{name}-doc-%{doc_commit} doc
 %patch0001 -p1
 %patch0002 -p1
-%patch0003 -p1
 
 mv deps/lua/COPYRIGHT    COPYRIGHT-lua
 mv deps/hiredis/COPYING  COPYING-hiredis
@@ -147,7 +142,7 @@ if test "$api" != "%{redis_modules_abi}"; then
    exit 1
 fi
 
-%global make_flags	DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" INSTALL="install -p" PREFIX=%{buildroot}%{_prefix} BUILD_WITH_SYSTEMD=yes BUILD_TLS=yes
+%global make_flags	DEBUG="" V="echo" LDFLAGS="%{?__global_ldflags}" CFLAGS+="%{optflags} -fPIC" INSTALL="install -p" PREFIX=%{buildroot}%{_prefix}
 
 %build
 make %{?_smp_mflags} %{make_flags} all
@@ -277,24 +272,6 @@ exit 0
 
 
 %changelog
-* Wed Jun 10 2020 Nathan Scott <nathans@redhat.com> - 6.0.5-1
-- Upstream 6.0.5 release.
-
-* Thu May 28 2020 Remi Collet <remi@remirepo.net> - 6.0.4-3
-- Add comment for TimeoutStartSec and TimeoutStopSec in limit.conf
-- Fix missing notification to systemd for sentinel
-  patch from https://github.com/antirez/redis/pull/7168
-- Upstream 6.0.4 release.
-
-* Mon May 18 2020 Nathan Scott <nathans@redhat.com> - 6.0.3-1
-- Upstream 6.0.3 release.
-
-* Wed May  6 2020 Remi Collet <rcollet@redhat.com> - 6.0.1-1
-- Upstream 6.0.1 release.
-
-* Fri May 01 2020 Nathan Scott <nathans@redhat.com> - 6.0.0-1
-- Upstream 6.0.0 release.
-
 * Fri Mar 13 2020 Nathan Scott <nathans@redhat.com> - 5.0.8-1
 - Upstream 5.0.8 release.