From 74836e8db5299837e65fd23ba7632773541bfc05 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Tue, 12 Sep 2017 17:28:06 +1000 Subject: [PATCH] Redis package builds for the 4.0 series Upstream redis-4.0.1 release packages, including a devel header-only package for module support. --- ...or-redis-cli-redis-benchmark-redis-c.patch | 2 +- ...eck-rdb-as-a-symlink-instead-of-dupl.patch | 17 ++++++----- redis.spec | 30 +++++++++++++++++-- sources | 2 +- 4 files changed, 38 insertions(+), 13 deletions(-) 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 843dfb4..362b6de 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,4 +1,4 @@ -From e1ded77b1f80a5241f2f9b5088b9063ecbeb72c9 Mon Sep 17 00:00:00 2001 +From ed77684a7eb20635e7f8f8f3ead277c3c48182fe Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Sep 2016 14:51:15 +0200 Subject: [PATCH 1/2] 1st man pageis for - redis-cli - redis-benchmark - 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 4c4181a..4310cf3 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,25 +1,26 @@ -From bcd509def0d4a75f56d9d6a53eea280127803eb4 Mon Sep 17 00:00:00 2001 +From a7e5d1dab11be34fafe80180f58411f02cd98026 Mon Sep 17 00:00:00 2001 From: Remi Collet 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 +Subject: [PATCH 2/2] install redis-check-rdb as a symlink instead of duplicating + the binary --- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 6c27dd9..2de5e3f 100644 +index 4a8a326..a1bbfe9 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -267,6 +267,6 @@ install: all +@@ -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) +- $(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.9.3 diff --git a/redis.spec b/redis.spec index 3687968..8d32e17 100644 --- a/redis.spec +++ b/redis.spec @@ -17,8 +17,8 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: redis -Version: 3.2.10 -Release: 3%{?dist} +Version: 4.0.1 +Release: 2%{?dist} Summary: A persistent key-value database License: BSD URL: http://redis.io @@ -98,6 +98,15 @@ a cache. You can use Redis from most programming languages also. +%package devel +Summary: Development header for Redis module development +# Header-Only Library (https://fedoraproject.org/wiki/Packaging:Guidelines) +Provides: %{name}-static = %{version}-%{release} + +%description devel +Header file required for building loadable Redis modules. Detailed API +documentation available at [http://redis-module-redoc.readthedocs.io/] + %if 0%{?with_redistrib} %package trib Summary: Cluster management script for Redis @@ -151,6 +160,7 @@ make %{?_smp_mflags} \ %else MALLOC=jemalloc \ %endif + INSTALL="install -p" PREFIX=%{buildroot}%{_prefix} \ all %install @@ -189,6 +199,9 @@ chmod 755 %{buildroot}%{_bindir}/%{name}-* # Install redis-shutdown install -pDm755 %{S:6} %{buildroot}%{_libexecdir}/%{name}-shutdown +# Install redis module header +install -pDm644 src/%{name}module.h %{buildroot}%{_includedir}/%{name}module.h + %if 0%{?with_redistrib} # Install redis-trib install -pDm755 src/%{name}-trib.rb %{buildroot}%{_bindir}/%{name}-trib @@ -263,6 +276,7 @@ fi %if 0%{?with_redistrib} %exclude %{_bindir}/%{name}-trib %endif +%exclude %{_includedir}/%{name}module.h %{_bindir}/%{name}-* %{_libexecdir}/%{name}-* %{_mandir}/man1/%{name}* @@ -280,6 +294,10 @@ fi %config(noreplace) %{_sysconfdir}/security/limits.d/95-%{name}.conf %endif +%files devel +%license COPYING +%{_includedir}/%{name}module.h + %if 0%{?with_redistrib} %files trib %license COPYING @@ -288,10 +306,16 @@ fi %changelog -* Wed Sep 06 2017 Nathan Scott - 3.2.10-3 + +* Wed Sep 06 2017 Nathan Scott - 4.0.1-2 - 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 - 4.0.1-1 +- Upstream 4.0.1 release. (RHBZ #1389592) +- Add redis-devel for loadable module development. +- Provide redis-check-aof as a symlink to redis-server also now. + * Mon Aug 14 2017 Nathan Scott - 3.2.10-2 - Add redis-trib based on patch from Sebastian Saletnik. (RHBZ #1215654) diff --git a/sources b/sources index 40c7ebf..9411699 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (redis-3.2.10.tar.gz) = 32fd27fac8ba559ea38e3a1006b90c4117c74a8ca15399ade19834c4221521e7e3669e4e1f24d214a53bb7cde896839438dd4a273d6be6def587841dd9954aa1 +SHA512 (redis-4.0.1.tar.gz) = 62dec537aebd12340b9642f5f8b07fd98757c9e648dcd539a0411f207db3495923c5a6a9941036c56b2d574ee38b46d08558668111e322345ef549f93fada26f