diff --git a/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch b/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch index 7eaab5e..843dfb4 100644 --- a/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch +++ b/0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch @@ -1,7 +1,7 @@ From e1ded77b1f80a5241f2f9b5088b9063ecbeb72c9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Sep 2016 14:51:15 +0200 -Subject: [PATCH 6/7] 1st man pageis for - redis-cli - redis-benchmark - +Subject: [PATCH 1/2] 1st man pageis for - redis-cli - redis-benchmark - redis-check-aof - redis-check-rdb - redis-server - redis.conf as redis-sentinel is a symlink to redis-server, same page can be used (also symlinked) diff --git a/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch b/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch index 2675435..4c4181a 100644 --- a/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch +++ b/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch @@ -1,7 +1,7 @@ From bcd509def0d4a75f56d9d6a53eea280127803eb4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 9 Sep 2016 17:23:27 +0200 -Subject: [PATCH 7/7] install redis-check-rdb as a symlink instead of +Subject: [PATCH 2/2] install redis-check-rdb as a symlink instead of duplicating the binary --- diff --git a/redis-sentinel.service b/redis-sentinel.service index 850cd81..15463cf 100644 --- a/redis-sentinel.service +++ b/redis-sentinel.service @@ -3,7 +3,7 @@ Description=Redis Sentinel After=network.target [Service] -ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --daemonize no +ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --supervised systemd ExecStop=/usr/libexec/redis-shutdown redis-sentinel Type=notify User=redis diff --git a/redis.service b/redis.service index dffde40..88e9edc 100644 --- a/redis.service +++ b/redis.service @@ -3,7 +3,7 @@ Description=Redis persistent key-value database After=network.target [Service] -ExecStart=/usr/bin/redis-server /etc/redis.conf --daemonize no +ExecStart=/usr/bin/redis-server /etc/redis.conf --supervised systemd ExecStop=/usr/libexec/redis-shutdown Type=notify User=redis diff --git a/redis.spec b/redis.spec index cb0728d..3687968 100644 --- a/redis.spec +++ b/redis.spec @@ -69,6 +69,9 @@ Requires(preun): chkconfig Requires(preun): initscripts Requires(postun): initscripts %endif +Provides: bundled(hiredis) +Provides: bundled(lua-libs) +Provides: bundled(linenoise) %description Redis is an advanced key-value store. It is often referred to as a data @@ -165,7 +168,7 @@ install -pDm644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -pDm640 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf install -pDm640 sentinel.conf %{buildroot}%{_sysconfdir}/%{name}-sentinel.conf -# Install Systemd unit files. +# Install systemd unit files. %if 0%{?with_systemd} mkdir -p %{buildroot}%{_unitdir} install -pm644 %{S:3} %{buildroot}%{_unitdir} @@ -285,8 +288,9 @@ fi %changelog -* Mon Aug 28 2017 Nathan Scott - 3.2.10-3 +* Wed Sep 06 2017 Nathan Scott - 3.2.10-3 - Switch to using Type=notify for Redis systemd services (RHBZ #1172841) +- Add Provides:bundled hiredis, linenoise, lua-libs clauses (RHBZ #788500) * Mon Aug 14 2017 Nathan Scott - 3.2.10-2 - Add redis-trib based on patch from Sebastian Saletnik. (RHBZ #1215654)