redis: 2.6.10

2 files changed, 16 insertions, 12 deletions

diff --git a/redis-2.6.0-redis.conf.patch b/redis-2.6.10-conf.patch
index ed31d6d..0b6bad9 100644
--- a/redis-2.6.0-redis.conf.patch
+++ b/redis-2.6.10-conf.patch
@@ -1,7 +1,6 @@
-diff -up redis-2.6.0-rc6/redis.conf.orig redis-2.6.0-rc6/redis.conf
---- redis-2.6.0-rc6/redis.conf.orig	2012-08-30 17:04:18.167789269 +0200
-+++ redis-2.6.0-rc6/redis.conf	2012-08-30 17:04:36.102834301 +0200
-@@ -18,7 +18,7 @@ daemonize no
+--- redis-2.6.10/redis.conf.orig	2013-02-11 13:24:39.000000000 +0100
++++ redis-2.6.10/redis.conf	2013-02-11 19:05:09.533275700 +0100
+@@ -18,7 +18,7 @@
  
  # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
  # default. You can specify a custom pid file location here.
@@ -10,7 +9,7 @@ diff -up redis-2.6.0-rc6/redis.conf.orig redis-2.6.0-rc6/redis.conf
  
  # 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 @@ port 6379
+@@ -27,7 +27,7 @@
  # If you want you can bind a single interface, if the bind option is not
  # specified all the interfaces will listen for incoming connections.
  #
@@ -19,7 +18,7 @@ diff -up redis-2.6.0-rc6/redis.conf.orig redis-2.6.0-rc6/redis.conf
  
  # 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
-@@ -50,7 +50,7 @@ loglevel notice
+@@ -66,7 +66,7 @@
  # 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
@@ -28,8 +27,8 @@ diff -up redis-2.6.0-rc6/redis.conf.orig redis-2.6.0-rc6/redis.conf
  
  # To enable logging to the system logger, just set 'syslog-enabled' to yes,
  # and optionally update the other syslog parameters to suit your needs.
-@@ -134,7 +134,7 @@ dbfilename dump.rdb
- # Also the Append Only File will be created inside this directory.
+@@ -150,7 +150,7 @@
+ # The Append Only File will also be created inside this directory.
  # 
  # Note that you must specify a directory here, not a file name.
 -dir ./
diff --git a/redis.spec b/redis.spec
index 84c03aa..4f67890 100644
--- a/redis.spec
+++ b/redis.spec
@@ -13,7 +13,7 @@
 %endif
 
 Name:             redis
-Version:          2.6.9
+Version:          2.6.10
 Release:          %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
 Summary:          A persistent key-value database
 
@@ -25,7 +25,7 @@ Source1:          %{name}.logrotate
 Source2:          %{name}.init
 Source3:          %{name}.service
 # Update configuration for Fedora
-Patch0:           %{name}-2.6.0-redis.conf.patch
+Patch0:           %{name}-2.6.10-conf.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if !0%{?el5}
@@ -176,6 +176,11 @@ fi
 
 
 %changelog
+* Mon Feb 11 2013 Remi Collet <remi@fedoraproject.org> - 2.6.10-1
+- Redis 2.6.10
+  upgrade urgency: MODERATE, this release contains many non
+  critical fixes and many small improvements.
+
 * Thu Jan 17 2013 Remi Collet <remi@fedoraproject.org> - 2.6.9-1
 - Redis 2.6.9
   upgrade urgency: MODERATE if you use replication.
@@ -234,7 +239,7 @@ fi
 * Sat Feb 04 2012 Silas Sewell <silas@sewell.org> - 2.4.7-1
 - Update to redis 2.4.7
 
-* Tue Feb 01 2012 Fabian Deutsch <fabiand@fedoraproject.org> - 2.4.6-4
+* Wed Feb 01 2012 Fabian Deutsch <fabiand@fedoraproject.org> - 2.4.6-4
 - Fixed a typo in the spec
 
 * Tue Jan 31 2012 Fabian Deutsch <fabiand@fedoraproject.org> - 2.4.6-3
@@ -274,7 +279,7 @@ fi
 - Update to redis 2.0.2
 - Disable checks section for el5
 
-* Fri Sep 11 2010 Silas Sewell <silas@sewell.ch> - 2.0.1-1
+* Sat Sep 11 2010 Silas Sewell <silas@sewell.ch> - 2.0.1-1
 - Update to redis 2.0.1
 
 * Sat Sep 04 2010 Silas Sewell <silas@sewell.ch> - 2.0.0-1