From 1bb2f79e98fcedef51a756617f98ed3edd981ee0 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Mon, 31 Aug 2015 17:41:30 +0800 Subject: [PATCH 1/6] SPEC cleanup --- redis-sentinel.service | 1 - redis.service | 1 - redis.spec | 31 +++++++++++++++---------------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/redis-sentinel.service b/redis-sentinel.service index 2ec86ae..42cc5c0 100644 --- a/redis-sentinel.service +++ b/redis-sentinel.service @@ -10,4 +10,3 @@ Group=redis [Install] WantedBy=multi-user.target - diff --git a/redis.service b/redis.service index 1c549b4..c97ae13 100644 --- a/redis.service +++ b/redis.service @@ -10,4 +10,3 @@ Group=redis [Install] WantedBy=multi-user.target - diff --git a/redis.spec b/redis.spec index d823591..431da21 100644 --- a/redis.spec +++ b/redis.spec @@ -69,26 +69,26 @@ Requires(postun): initscripts %endif %description -Redis is an advanced key-value store. It is often referred to as a data -structure server since keys can contain strings, hashes, lists, sets and +Redis is an advanced key-value store. It is often referred to as a data +structure server since keys can contain strings, hashes, lists, sets and sorted sets. You can run atomic operations on these types, like appending to a string; -incrementing the value in a hash; pushing to a list; computing set -intersection, union and difference; or getting the member with highest +incrementing the value in a hash; pushing to a list; computing set +intersection, union and difference; or getting the member with highest ranking in a sorted set. -In order to achieve its outstanding performance, Redis works with an -in-memory dataset. Depending on your use case, you can persist it either -by dumping the dataset to disk every once in a while, or by appending +In order to achieve its outstanding performance, Redis works with an +in-memory dataset. Depending on your use case, you can persist it either +by dumping the dataset to disk every once in a while, or by appending each command to a log. -Redis also supports trivial-to-setup master-slave replication, with very -fast non-blocking first synchronization, auto-reconnection on net split +Redis also supports trivial-to-setup master-slave replication, with very +fast non-blocking first synchronization, auto-reconnection on net split and so forth. -Other features include Transactions, Pub/Sub, Lua scripting, Keys with a -limited time-to-live, and configuration settings to make Redis behave like +Other features include Transactions, Pub/Sub, Lua scripting, Keys with a +limited time-to-live, and configuration settings to make Redis behave like a cache. You can use Redis from most programming languages also. @@ -107,7 +107,7 @@ sed -i -e 's|\t@|\t|g' deps/lua/src/Makefile sed -i -e 's|$(QUIET_CC)||g' src/Makefile sed -i -e 's|$(QUIET_LINK)||g' src/Makefile sed -i -e 's|$(QUIET_INSTALL)||g' src/Makefile -# Ensure deps are built with proper flags +# Ensure deps are built with proper flags. sed -i -e 's|$(CFLAGS)|%{optflags}|g' deps/Makefile sed -i -e 's|OPTIMIZATION?=-O3|OPTIMIZATION=%{optflags}|g' deps/hiredis/Makefile sed -i -e 's|$(LDFLAGS)|%{?__global_ldflags}|g' deps/hiredis/Makefile @@ -151,12 +151,12 @@ install -pm644 %{S:2} %{buildroot}%{_unitdir} # Install systemd tmpfiles config. install -pDm644 %{S:4} %{buildroot}%{_tmpfilesdir}/%{name}.conf # Install systemd limit files (requires systemd >= 204) -install -p -D -m 644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf -install -p -D -m 644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf +install -pDm644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf +install -pDm644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf %else # install SysV service files install -pDm755 %{S:5} %{buildroot}%{_initrddir}/%{name}-sentinel install -pDm755 %{S:6} %{buildroot}%{_initrddir}/%{name} -install -p -D -m 644 %{S:9} %{buildroot}%{_sysconfdir}/security/limits.d/95-%{name}.conf +install -pDm644 %{S:9} %{buildroot}%{_sysconfdir}/security/limits.d/95-%{name}.conf %endif # Fix non-standard-executable-perm error. @@ -241,7 +241,6 @@ fi %config(noreplace) %{_sysconfdir}/security/limits.d/95-%{name}.conf %endif - %changelog * Tue Jul 21 2015 Haïkel Guémar - 3.0.3-1 - Upstream 3.0.3 From fc3308ff8294dffa4abb8e62c8964508b5e2a949 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Mon, 31 Aug 2015 18:28:16 +0800 Subject: [PATCH 2/6] Rebuilt for jemalloc 4.0.0 --- redis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redis.spec b/redis.spec index 431da21..f9bf9a8 100644 --- a/redis.spec +++ b/redis.spec @@ -12,7 +12,7 @@ Name: redis Version: 3.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A persistent key-value database License: BSD URL: http://redis.io @@ -242,6 +242,9 @@ fi %endif %changelog +* Sun Aug 30 2015 Christopher Meng - 3.0.3-2 +- Rebuilt for jemalloc 4.0.0 + * Tue Jul 21 2015 Haïkel Guémar - 3.0.3-1 - Upstream 3.0.3 From 5c3ab3d4f80197da5cef8a1132d5018ab53d0337 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Wed, 9 Sep 2015 17:11:05 +0800 Subject: [PATCH 3/6] Update to 3.0.4 --- .gitignore | 1 + redis.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9bf3e34..9376280 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /redis-3.0.1.tar.gz /redis-3.0.2.tar.gz /redis-3.0.3.tar.gz +/redis-3.0.4.tar.gz diff --git a/redis.spec b/redis.spec index f9bf9a8..0626f0b 100644 --- a/redis.spec +++ b/redis.spec @@ -11,8 +11,8 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: redis -Version: 3.0.3 -Release: 2%{?dist} +Version: 3.0.4 +Release: 1%{?dist} Summary: A persistent key-value database License: BSD URL: http://redis.io @@ -242,6 +242,9 @@ fi %endif %changelog +* Mon Sep 07 2015 Christopher Meng - 3.0.4-1 +- Update to 3.0.4 + * Sun Aug 30 2015 Christopher Meng - 3.0.3-2 - Rebuilt for jemalloc 4.0.0 diff --git a/sources b/sources index ef336eb..dafe355 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76725490d6168cfb4b0ce014b89d4b54 redis-3.0.3.tar.gz +9e535dea3dc5301de012047bf3cca952 redis-3.0.4.tar.gz From 0df073751afb1dcc5b79ae8bfd197595fb053a88 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Fri, 16 Oct 2015 17:50:15 +0200 Subject: [PATCH 4/6] Revert "SPEC cleanup" This reverts commit 1bb2f79e98fcedef51a756617f98ed3edd981ee0. Not very useful, and makes spec even less readable --- redis-sentinel.service | 1 + redis.service | 1 + redis.spec | 31 ++++++++++++++++--------------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/redis-sentinel.service b/redis-sentinel.service index 42cc5c0..2ec86ae 100644 --- a/redis-sentinel.service +++ b/redis-sentinel.service @@ -10,3 +10,4 @@ Group=redis [Install] WantedBy=multi-user.target + diff --git a/redis.service b/redis.service index c97ae13..1c549b4 100644 --- a/redis.service +++ b/redis.service @@ -10,3 +10,4 @@ Group=redis [Install] WantedBy=multi-user.target + diff --git a/redis.spec b/redis.spec index 0626f0b..03fdabb 100644 --- a/redis.spec +++ b/redis.spec @@ -69,26 +69,26 @@ Requires(postun): initscripts %endif %description -Redis is an advanced key-value store. It is often referred to as a data -structure server since keys can contain strings, hashes, lists, sets and +Redis is an advanced key-value store. It is often referred to as a data +structure server since keys can contain strings, hashes, lists, sets and sorted sets. You can run atomic operations on these types, like appending to a string; -incrementing the value in a hash; pushing to a list; computing set -intersection, union and difference; or getting the member with highest +incrementing the value in a hash; pushing to a list; computing set +intersection, union and difference; or getting the member with highest ranking in a sorted set. -In order to achieve its outstanding performance, Redis works with an -in-memory dataset. Depending on your use case, you can persist it either -by dumping the dataset to disk every once in a while, or by appending +In order to achieve its outstanding performance, Redis works with an +in-memory dataset. Depending on your use case, you can persist it either +by dumping the dataset to disk every once in a while, or by appending each command to a log. -Redis also supports trivial-to-setup master-slave replication, with very -fast non-blocking first synchronization, auto-reconnection on net split +Redis also supports trivial-to-setup master-slave replication, with very +fast non-blocking first synchronization, auto-reconnection on net split and so forth. -Other features include Transactions, Pub/Sub, Lua scripting, Keys with a -limited time-to-live, and configuration settings to make Redis behave like +Other features include Transactions, Pub/Sub, Lua scripting, Keys with a +limited time-to-live, and configuration settings to make Redis behave like a cache. You can use Redis from most programming languages also. @@ -107,7 +107,7 @@ sed -i -e 's|\t@|\t|g' deps/lua/src/Makefile sed -i -e 's|$(QUIET_CC)||g' src/Makefile sed -i -e 's|$(QUIET_LINK)||g' src/Makefile sed -i -e 's|$(QUIET_INSTALL)||g' src/Makefile -# Ensure deps are built with proper flags. +# Ensure deps are built with proper flags sed -i -e 's|$(CFLAGS)|%{optflags}|g' deps/Makefile sed -i -e 's|OPTIMIZATION?=-O3|OPTIMIZATION=%{optflags}|g' deps/hiredis/Makefile sed -i -e 's|$(LDFLAGS)|%{?__global_ldflags}|g' deps/hiredis/Makefile @@ -151,12 +151,12 @@ install -pm644 %{S:2} %{buildroot}%{_unitdir} # Install systemd tmpfiles config. install -pDm644 %{S:4} %{buildroot}%{_tmpfilesdir}/%{name}.conf # Install systemd limit files (requires systemd >= 204) -install -pDm644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf -install -pDm644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf +install -p -D -m 644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf +install -p -D -m 644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf %else # install SysV service files install -pDm755 %{S:5} %{buildroot}%{_initrddir}/%{name}-sentinel install -pDm755 %{S:6} %{buildroot}%{_initrddir}/%{name} -install -pDm644 %{S:9} %{buildroot}%{_sysconfdir}/security/limits.d/95-%{name}.conf +install -p -D -m 644 %{S:9} %{buildroot}%{_sysconfdir}/security/limits.d/95-%{name}.conf %endif # Fix non-standard-executable-perm error. @@ -241,6 +241,7 @@ fi %config(noreplace) %{_sysconfdir}/security/limits.d/95-%{name}.conf %endif + %changelog * Mon Sep 07 2015 Christopher Meng - 3.0.4-1 - Update to 3.0.4 From d3f6a51d6bc433799386ca704a878b9a8676d283 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Fri, 16 Oct 2015 18:05:17 +0200 Subject: [PATCH 5/6] Upstream 3.0.5 - Fix slave/master replication hanging forever in certain case --- .gitignore | 1 + redis.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9376280..be975c0 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /redis-3.0.2.tar.gz /redis-3.0.3.tar.gz /redis-3.0.4.tar.gz +/redis-3.0.5.tar.gz diff --git a/redis.spec b/redis.spec index 03fdabb..3ae83d1 100644 --- a/redis.spec +++ b/redis.spec @@ -11,7 +11,7 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: redis -Version: 3.0.4 +Version: 3.0.5 Release: 1%{?dist} Summary: A persistent key-value database License: BSD @@ -243,6 +243,10 @@ fi %changelog +* Fri Oct 16 2015 Haïkel Guémar - 3.0.5-1 +- Upstream 3.0.5 +- Fix slave/master replication hanging forever in certain case + * Mon Sep 07 2015 Christopher Meng - 3.0.4-1 - Update to 3.0.4 diff --git a/sources b/sources index dafe355..8761630 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e535dea3dc5301de012047bf3cca952 redis-3.0.4.tar.gz +c7ba233e5f92ad2f48860c815bb05480 redis-3.0.5.tar.gz From 9aa122a4db329612e86b17f46261770ee3caeded Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Sat, 19 Dec 2015 02:35:56 +0100 Subject: [PATCH 6/6] Upstream 3.0.6 (RHBZ#1272281) --- .gitignore | 1 + redis.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index be975c0..eb5c034 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /redis-3.0.3.tar.gz /redis-3.0.4.tar.gz /redis-3.0.5.tar.gz +/redis-3.0.6.tar.gz diff --git a/redis.spec b/redis.spec index 3ae83d1..3729192 100644 --- a/redis.spec +++ b/redis.spec @@ -11,7 +11,7 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: redis -Version: 3.0.5 +Version: 3.0.6 Release: 1%{?dist} Summary: A persistent key-value database License: BSD @@ -243,6 +243,9 @@ fi %changelog +* Sat Dec 19 2015 Haïkel Guémar - 3.0.6-1 +- Upstream 3.0.6 (RHBZ#1272281) + * Fri Oct 16 2015 Haïkel Guémar - 3.0.5-1 - Upstream 3.0.5 - Fix slave/master replication hanging forever in certain case diff --git a/sources b/sources index 8761630..b13b85a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7ba233e5f92ad2f48860c815bb05480 redis-3.0.5.tar.gz +9a44ea6bff987d2113caea7761730376 redis-3.0.6.tar.gz