- use symlinks when possible (patch from fedora)

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
new file mode 100644 (file)
index 0000000..ce09350
--- /dev/null
+++ b/0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch
@@ -0,0 +1,26 @@
+From 992c773e70462a6fbe1536e18e673c9ab55d5901 Mon Sep 17 00:00:00 2001
+From: Remi Collet <fedora@famillecollet.com>
+Date: Fri, 9 Sep 2016 17:23:27 +0200
+Subject: [PATCH 2/2] install redis-check-rdb as a symlink instead of duplicating
+ the binary
+
+---
+ src/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index fdbe36a..c3083f8 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -287,6 +287,6 @@ install: all
+       $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN)
+       $(REDIS_INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN)
+       $(REDIS_INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN)
+-      $(REDIS_INSTALL) $(REDIS_CHECK_RDB_NAME) $(INSTALL_BIN)
+-      $(REDIS_INSTALL) $(REDIS_CHECK_AOF_NAME) $(INSTALL_BIN)
+       @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME)
++      @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME)
++      @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_AOF_NAME)
+-- 
+2.13.5
+

diff --git a/redis.spec b/redis.spec
index bf9d08227ed639280b6a49c5d0c8b7d25c156858..ef32eaf35aee896a0401bb6c4aee3653dd2abf0c 100644 (file)
--- a/redis.spec
+++ b/redis.spec
@@ -25,6 +25,7 @@ Source3:      %{name}.tmpfiles
 Patch0:                %{name}.conf.patch
 Patch1:                %{name}-tcl.patch
 Patch2:                0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
+Patch3:                0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch
 URL:           http://www.redis.io/
 %{?with_perftools:BuildRequires:    gperftools-devel}
 BuildRequires: jemalloc-static
@@ -74,6 +75,7 @@ disk.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Remove integration tests
 %{__sed} -i -e '/    integration\/replication/d' tests/test_helper.tcl