From 1a6356a17b0a4a8e1f14c137c1aaffc602a8a84c Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sat, 14 Dec 2013 10:27:43 +0100
Subject: redis: 2.8.3 (upgrade urgency: MODERATE for Redis, HIGH for Sentinel)

---
 redis-2.8.2-conf.patch | 38 --------------------------------------
 redis-2.8.3-conf.patch | 37 +++++++++++++++++++++++++++++++++++++
 redis.spec             | 13 ++++++++++---
 3 files changed, 47 insertions(+), 41 deletions(-)
 delete mode 100644 redis-2.8.2-conf.patch
 create mode 100644 redis-2.8.3-conf.patch

diff --git a/redis-2.8.2-conf.patch b/redis-2.8.2-conf.patch
deleted file mode 100644
index 948cc47..0000000
--- a/redis-2.8.2-conf.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- redis-2.8.2/redis.conf.orig	2013-12-02 16:07:46.000000000 +0100
-+++ redis-2.8.2/redis.conf	2013-12-02 17:42:33.303049978 +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.
--pidfile /var/run/redis.pid
-+pidfile /var/run/redis/redis.pid
- 
- # Accept connections on the specified port, default is 6379.
- # If port 0 is specified Redis will not listen on a TCP socket.
-@@ -32,7 +32,7 @@
- # Examples:
- #
- # bind 192.168.1.100 10.0.0.1
--# bind 127.0.0.1
-+bind 127.0.0.1
- 
- # 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
-@@ -71,7 +71,7 @@
- # Specify the log file name. Also the emptry string 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
--logfile ""
-+logfile /var/log/redis/redis.log
- 
- # To enable logging to the system logger, just set 'syslog-enabled' to yes,
- # and optionally update the other syslog parameters to suit your needs.
-@@ -155,7 +155,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 ./
-+dir /var/lib/redis/
- 
- ################################# REPLICATION #################################
- 
diff --git a/redis-2.8.3-conf.patch b/redis-2.8.3-conf.patch
new file mode 100644
index 0000000..f6ceba2
--- /dev/null
+++ b/redis-2.8.3-conf.patch
@@ -0,0 +1,37 @@
+--- redis-2.8.3/redis.conf.conf	2013-12-14 10:09:57.015046918 +0100
++++ redis-2.8.3/redis.conf	2013-12-14 10:08:57.827879506 +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.
+-pidfile /var/run/redis.pid
++pidfile /var/run/redis/redis.pid
+ 
+ # Accept connections on the specified port, default is 6379.
+ # If port 0 is specified Redis will not listen on a TCP socket.
+@@ -33,6 +33,7 @@
+ #
+ # bind 192.168.1.100 10.0.0.1
+ # bind 127.0.0.1
++bind 127.0.0.1
+ 
+ # 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
+@@ -71,7 +72,7 @@
+ # Specify the log file name. Also the empty string 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
+-logfile ""
++logfile /var/log/redis/redis.log
+ 
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+@@ -155,7 +156,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 ./
++dir /var/lib/redis/
+ 
+ ################################# REPLICATION #################################
+ 
diff --git a/redis.spec b/redis.spec
index 039464c..17fb09d 100644
--- a/redis.spec
+++ b/redis.spec
@@ -18,7 +18,7 @@
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:             redis
-Version:          2.8.2
+Version:          2.8.3
 Release:          %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
 Summary:          A persistent key-value database
 
@@ -31,7 +31,7 @@ Source2:          %{name}.init
 Source3:          %{name}.service
 Source4:          %{name}.tmpfiles
 # Update configuration for Fedora
-Patch0:           %{name}-2.8.2-conf.patch
+Patch0:           %{name}-2.8.3-conf.patch
 Patch1:           %{name}-deps-PIC.patch
 Patch2:           %{name}-deps-unbundle-jemalloc.patch
 
@@ -191,8 +191,9 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc 00-RELEASENOTES BUGS CONTRIBUTING COPYING README
+%doc sentinel.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%attr(0644, redis, root) %config(noreplace) %{_sysconfdir}/%{name}.conf
 %dir %attr(0755, redis, root) %{_localstatedir}/lib/%{name}
 %dir %attr(0755, redis, root) %{_localstatedir}/log/%{name}
 %dir %attr(0755, redis, root) %{_localstatedir}/run/%{name}
@@ -207,6 +208,12 @@ fi
 
 
 %changelog
+* Sat Dec 14 2013 Remi Collet <remi@fedoraproject.org> - 2.8.3-1
+- Redis 2.8.3
+  upgrade urgency: MODERATE for Redis, HIGH for Sentinel.
+- redis own /etc/redis.conf (needed CONFIG WRITE)
+- add sentinel.conf as documentation
+
 * Mon Dec  2 2013 Remi Collet <remi@fedoraproject.org> - 2.8.2-1
 - Redis 2.8.2, new major version
 - pull rawhide changes (add tmpfiles)
-- 
cgit