redis update to 2.6.0RC6

2 files changed, 18 insertions, 18 deletions

diff --git a/redis-2.4.6-redis.conf.patch b/redis-2.6.0-redis.conf.patch
index 109238e..ed31d6d 100644
--- a/redis-2.4.6-redis.conf.patch
+++ b/redis-2.6.0-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.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
  
  # 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 eb1048d..8ed1434 100644
--- a/redis.spec
+++ b/redis.spec
@@ -6,20 +6,22 @@
 %global with_perftools 1
 %endif
 
+%global prever rc6
+
 Name:             redis
-Version:          2.4.16
-Release:          1%{?dist}
+Version:          2.6.0
+Release:          %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
 Summary:          A persistent key-value database
 
 Group:            Applications/Databases
 License:          BSD
 URL:              http://redis.io
-Source0:          http://redis.googlecode.com/files/%{name}-%{version}.tar.gz
+Source0:          http://redis.googlecode.com/files/%{name}-%{version}%{?prever:-%{prever}}.tar.gz
 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.0-redis.conf.patch
 
 BuildRequires:    systemd-units
 %if !0%{?el5}
@@ -45,8 +47,8 @@ union, intersection, difference between sets, and so forth. Redis supports
 different kind of sorting abilities.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{version}%{?prever:-%{prever}}
+%patch0 -p1 -b .orig
 
 %build
 make %{?_smp_mflags} \
@@ -114,6 +116,9 @@ fi
 %{_unitdir}/%{name}.service
 
 %changelog
+* Thu Aug 30 2012 Remi Collet <remi@fedoraproject.org> - 2.6.0-0.1.rc6
+- Update to redis 2.6.0-RC6
+
 * Thu Aug 30 2012 Remi Collet <remi@fedoraproject.org> - 2.4.16-1
 - Update to redis 2.4.16