From 5fe22d6240d5b4fe4b4895c8a7ce11769b94c70beec9dcc727d0e20a1ddb5b1e Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <prusnak@opensuse.org>
Date: Sun, 7 Mar 2010 17:22:11 +0000
Subject: [PATCH] - updated to 1.2.4

OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=5
---
 redis-1.2.2.tar.gz     |  3 ---
 redis-1.2.4.tar.gz     |  3 +++
 redis-initscript.patch | 16 +++++++++-------
 redis.changes          | 14 ++++++++++++++
 redis.spec             |  6 +++---
 5 files changed, 29 insertions(+), 13 deletions(-)
 delete mode 100644 redis-1.2.2.tar.gz
 create mode 100644 redis-1.2.4.tar.gz

diff --git a/redis-1.2.2.tar.gz b/redis-1.2.2.tar.gz
deleted file mode 100644
index db567ed..0000000
--- a/redis-1.2.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7a22e92f6f842fee5897415572860a8151f31506befdc4b94565f9ed58e7ece
-size 203705
diff --git a/redis-1.2.4.tar.gz b/redis-1.2.4.tar.gz
new file mode 100644
index 0000000..f3a7b06
--- /dev/null
+++ b/redis-1.2.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f92e3f08bf815bdfa57ed56544037c0f2c7582d15d0fb5eb2c921cf6eb195b9
+size 203982
diff --git a/redis-initscript.patch b/redis-initscript.patch
index 391f520..594677e 100644
--- a/redis-initscript.patch
+++ b/redis-initscript.patch
@@ -1,5 +1,7 @@
---- utils/redis_init_script.orig	2010-03-05 06:08:56.000000000 -0500
-+++ utils/redis_init_script	2010-03-05 06:09:16.000000000 -0500
+Index: utils/redis_init_script
+===================================================================
+--- utils/redis_init_script.orig
++++ utils/redis_init_script
 @@ -1,7 +1,18 @@
  #!/bin/sh
 +### BEGIN INIT INFO
@@ -20,20 +22,20 @@
  
  PIDFILE=/var/run/redis_${REDISPORT}.pid
  CONF="/etc/redis/${REDISPORT}.conf"
-@@ -22,7 +33,7 @@
+@@ -22,7 +33,7 @@ case "$1" in
                  echo -n "$PIDFILE does not exist, process is not running\n"
          else
                  echo -n "Stopping ...\n"
--                echo -n "Sending SHUTDOWN\r\n" | nc localhost $REDISPORT &
-+                echo -n "Sending SHUTDOWN\r\n" | netcat localhost $REDISPORT &
+-                echo -n "SHUTDOWN\r\n" | nc localhost $REDISPORT &
++                echo -n "SHUTDOWN\r\n" | netcat localhost $REDISPORT &
                  PID=$(cat $PIDFILE)
                  while [ -x /proc/${PIDFILE} ]
                  do
-@@ -33,4 +44,7 @@
+@@ -33,4 +44,7 @@ case "$1" in
                  echo "Redis stopped"
          fi
          ;;
 +       *)
-+        echo "Usage: rcredis [start|stop]"
++        echo "Usage: $0 [start|stop]"
 +        ;;
  esac
diff --git a/redis.changes b/redis.changes
index b4036fb..9fc8efa 100644
--- a/redis.changes
+++ b/redis.changes
@@ -1,9 +1,23 @@
+-------------------------------------------------------------------
+Sun Mar  7 17:21:53 UTC 2010 - prusnak@suse.cz
+
+- updated to 1.2.4
+
+-------------------------------------------------------------------
 Fri Mar  5 06:12:24 EST 2010 - pzb@suse.de
 
 - Add BuildRoot to spec file to enable builds on old distros
 - Patch initscript to use netcat instead of nc i
     (same command, different package)
 
+- Update to Redis 1.2.3
+  - The example init script was broken for a typo. Fixed.
+  - Support for large files in 32 bit targets, very important when saving 
+      very large databases or when using the Append Only File (when Redis 
+      was compiled for 64 bit target there was no problem).
+  - Now 'make 32bit' uses -m32 instead of Apple-specific -arch
+  - Stack trace fixed for some Linux targets
+
 -------------------------------------------------------------------
 Thu Jan 21 16:32:45 UTC 2010 - prusnak@suse.cz
 
diff --git a/redis.spec b/redis.spec
index 8b92357..69d516e 100644
--- a/redis.spec
+++ b/redis.spec
@@ -15,7 +15,7 @@
 # norootforbuild
 
 Name:           redis
-Version:        1.2.2
+Version:        1.2.4
 Release:        1
 Url:            http://code.google.com/p/redis/
 License:        BSD License
@@ -56,12 +56,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc 00-RELEASENOTES BETATESTING.txt BUGS COPYING Changelog README TODO html
+%doc 00-RELEASENOTES BETATESTING.txt BUGS COPYING Changelog README TODO html/
 %{_bindir}/redis-benchmark
 %{_bindir}/redis-cli
 %{_sbindir}/redis-server
-%{_sbindir}/rcredis
 %{_sysconfdir}/init.d/redis
+%{_sbindir}/rcredis
 %dir %{_sysconfdir}/redis
 
 %changelog