diff options
| -rw-r--r-- | redis-pr3494.patch | 19 | ||||
| -rw-r--r-- | redis.spec | 14 |
2 files changed, 26 insertions, 7 deletions
diff --git a/redis-pr3494.patch b/redis-pr3494.patch new file mode 100644 index 0000000..f8494a2 --- /dev/null +++ b/redis-pr3494.patch @@ -0,0 +1,19 @@ +From 0786e630734f5522f1b6ba62ab4ad759c8002ebd Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Fri, 9 Sep 2016 17:23:27 +0200 +Subject: [PATCH] install redis-check-rdb as a symlink instead of duplicating + the binary + +--- + src/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Makefile b/src/Makefile +index 6bd8d8d..0661c58 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -272,3 +272,4 @@ install: all + $(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) @@ -28,7 +28,7 @@ Name: redis Version: 3.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A persistent key-value database Group: Applications/Databases @@ -55,6 +55,8 @@ Patch2: 0003-redis-2.8.11-use-system-jemalloc.patch # https://github.com/antirez/redis/pull/3491 - man pages Patch3: %{name}-pr3491.patch +# https://github.com/antirez/redis/pull/3494 - symlink +Patch4: %{name}-pr3494.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if !0%{?el5} @@ -119,6 +121,7 @@ Documentation: http://redis.io/documentation %patch2 -p1 -b .jem %patch3 -p1 +%patch4 -p1 -b .old # No hidden build. sed -i -e 's|\t@|\t|g' deps/lua/src/Makefile @@ -179,12 +182,6 @@ install -p -D -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/security/limits.d/95- # Fix non-standard-executable-perm error chmod 755 %{buildroot}%{_bindir}/%{name}-* -# create redis-sentinel command as described on -# http://redis.io/topics/sentinel -ln -sf %{name}-server %{buildroot}%{_bindir}/%{name}-sentinel -# Same binary -ln -sf %{name}-server %{buildroot}%{_bindir}/%{name}-check-rdb - # Install redis-shutdown install -pDm755 %{SOURCE7} %{buildroot}%{_bindir}/%{name}-shutdown @@ -271,6 +268,9 @@ fi %changelog +* Fri Sep 9 2016 Remi Collet <remi@fedoraproject.org> - 3.2.3-3 +- add patch from https://github.com/antirez/redis/pull/3494 + * Fri Sep 9 2016 Remi Collet <remi@fedoraproject.org> - 3.2.3-2 - add man pages from https://github.com/antirez/redis/pull/3491 - data and configuration should not be publicly readable |