From 9a081bab561ef908c0e655f2d01528d9852a755d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 10:27:36 -0500 Subject: [PATCH 1/2] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- redis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redis.spec b/redis.spec index 8aad922..1c44a6d 100644 --- a/redis.spec +++ b/redis.spec @@ -8,7 +8,7 @@ Name: redis Version: 2.4.15 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A persistent key-value database Group: Applications/Databases @@ -114,6 +114,9 @@ fi %{_unitdir}/%{name}.service %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 2.4.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sun Jul 08 2012 Silas Sewell - 2.4.15-2 - Remove TODO from docs From 984073b2f8afcdfe61ce02a0f5abd147e2955913 Mon Sep 17 00:00:00 2001 From: Silas Sewell Date: Thu, 27 Dec 2012 08:07:28 -0500 Subject: [PATCH 2/2] Update to redis 2.6.7 --- .gitignore | 1 + ...conf.patch => redis-2.6.7-redis.conf.patch | 19 +++++++------------ redis.spec | 9 ++++++--- sources | 1 + 4 files changed, 15 insertions(+), 15 deletions(-) rename redis-2.4.6-redis.conf.patch => redis-2.6.7-redis.conf.patch (74%) diff --git a/.gitignore b/.gitignore index e0d8704..ae3e0d8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /redis-2.4.10.tar.gz /redis-2.4.13.tar.gz /redis-2.4.15.tar.gz +/redis-2.6.7.tar.gz diff --git a/redis-2.4.6-redis.conf.patch b/redis-2.6.7-redis.conf.patch similarity index 74% rename from redis-2.4.6-redis.conf.patch rename to redis-2.6.7-redis.conf.patch index 109238e..3c51809 100644 --- a/redis-2.4.6-redis.conf.patch +++ b/redis-2.6.7-redis.conf.patch @@ -1,6 +1,7 @@ ---- redis-2.4.6/redis.conf.orig 2012-01-13 09:01:20.032263652 +0100 -+++ redis-2.4.6/redis.conf 2012-01-13 09:02:57.223037913 +0100 -@@ -18,7 +18,7 @@ +diff -up redis-2.6.7/redis.conf.orig redis-2.6.7/redis.conf +--- redis-2.6.7/redis.conf.orig 2012-12-27 07:54:11.772560595 -0500 ++++ redis-2.6.7/redis.conf 2012-12-27 07:56:12.818571232 -0500 +@@ -18,7 +18,7 @@ daemonize no # When running daemonized, Redis writes a pid file in /var/run/redis.pid by # default. You can specify a custom pid file location here. @@ -9,7 +10,7 @@ # Accept connections on the specified port, default is 6379. # If port 0 is specified Redis will not listen on a TCP socket. -@@ -27,7 +27,7 @@ +@@ -27,7 +27,7 @@ port 6379 # If you want you can bind a single interface, if the bind option is not # specified all the interfaces will listen for incoming connections. # @@ -18,13 +19,7 @@ # Specify the path for the unix socket that will be used to listen for # incoming connections. There is no default, so Redis will not listen -@@ -45,12 +45,12 @@ - # verbose (many rarely useful info, but not a mess like the debug level) - # notice (moderately verbose, what you want in production probably) - # warning (only very important / critical messages are logged) --loglevel verbose -+loglevel notice - +@@ -50,7 +50,7 @@ loglevel notice # Specify the log file name. Also 'stdout' can be used to force # Redis to log on the standard output. Note that if you use standard # output for logging but daemonize, logs will be sent to /dev/null @@ -33,7 +28,7 @@ # To enable logging to the system logger, just set 'syslog-enabled' to yes, # and optionally update the other syslog parameters to suit your needs. -@@ -104,7 +104,7 @@ +@@ -134,7 +134,7 @@ dbfilename dump.rdb # Also the Append Only File will be created inside this directory. # # Note that you must specify a directory here, not a file name. diff --git a/redis.spec b/redis.spec index 1c44a6d..d1627be 100644 --- a/redis.spec +++ b/redis.spec @@ -7,8 +7,8 @@ %endif Name: redis -Version: 2.4.15 -Release: 3%{?dist} +Version: 2.6.7 +Release: 1%{?dist} Summary: A persistent key-value database Group: Applications/Databases @@ -19,7 +19,7 @@ Source1: %{name}.logrotate Source2: %{name}.init Source3: %{name}.service # Update configuration for Fedora -Patch0: %{name}-2.4.6-redis.conf.patch +Patch0: %{name}-2.6.7-redis.conf.patch BuildRequires: systemd-units %if !0%{?el5} @@ -114,6 +114,9 @@ fi %{_unitdir}/%{name}.service %changelog +* Thu Dec 27 2012 Silas Sewell - 2.6.7-1 +- Update to redis 2.6.7 + * Sat Jul 21 2012 Fedora Release Engineering - 2.4.15-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 92fb6b5..db4b51e 100644 --- a/sources +++ b/sources @@ -4,3 +4,4 @@ ac776d25f238b142d3d526cfcdc621ab redis-2.4.8.tar.gz 71938de99cbb4fdefd74d7571831fa28 redis-2.4.10.tar.gz f8a160f8a6fe7d7e8ebb4c23ff583d71 redis-2.4.13.tar.gz ef273152151c3f905d284cbdbbdb234c redis-2.4.15.tar.gz +9c3db210faff9fea3c17f2b71c2760f4 redis-2.6.7.tar.gz