From 5ee5ca17b53b48d403536f1ecc20729bb934affc59f324235bce01995981c754 Mon Sep 17 00:00:00 2001
From: Marcus Rueckert <mrueckert@suse.com>
Date: Tue, 24 May 2011 10:50:55 +0000
Subject: [PATCH] Accepting request 71138 from
 home:prusnak:branches:server:database

- updated to 2.2.7

OBS-URL: https://build.opensuse.org/request/show/71138
OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=20
---
 redis-2.2.4.tar.bz2 |  3 ---
 redis-2.2.7.tar.gz  |  3 +++
 redis.changes       | 19 +++++++++++++++++++
 redis.spec          |  4 ++--
 skip-aof-test.patch |  6 ++++--
 5 files changed, 28 insertions(+), 7 deletions(-)
 delete mode 100644 redis-2.2.4.tar.bz2
 create mode 100644 redis-2.2.7.tar.gz

diff --git a/redis-2.2.4.tar.bz2 b/redis-2.2.4.tar.bz2
deleted file mode 100644
index ca776d6..0000000
--- a/redis-2.2.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c41d5f8113cc582fd2560036fb66a59a2156710032a996cf7ecddc64fe4a2743
-size 336211
diff --git a/redis-2.2.7.tar.gz b/redis-2.2.7.tar.gz
new file mode 100644
index 0000000..53518e2
--- /dev/null
+++ b/redis-2.2.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3497a6ee23b678585f92e81da2239e2ef12ff1524bb7216bfe3e9395d1e0a2b
+size 448151
diff --git a/redis.changes b/redis.changes
index d7d308a..51163e7 100644
--- a/redis.changes
+++ b/redis.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue May 24 09:39:19 UTC 2011 - prusnak@opensuse.org
+
+- updated to 2.2.7
+  * Fixed bug #543-2 (the issue was reopened with a completely
+    different report) that caused Redis to randomly crash on list
+    push performed against lists with other clients blocked with BLPOP
+    (or variants).
+  (changes from 2.2.6)
+  * Fixed bug #543. If you saw Redis instances crashing on List
+    operations (only happening with a non-default max entry size
+    ziplist setting in redis.conf) it was almost certainly this
+    problem.
+  * Fixed a bug with replication where SLAVEOF NO ONE caused
+    a slave to close the connection with all its slaves.
+  (changes from 2.2.5)
+  * Fixed a crash occurring when loading an AOF containing
+    the SPOP command.
+
 -------------------------------------------------------------------
 Fri Apr 15 18:18:56 UTC 2011 - mrueckert@suse.de
 
diff --git a/redis.spec b/redis.spec
index 7105559..74d1064 100644
--- a/redis.spec
+++ b/redis.spec
@@ -18,7 +18,7 @@
 %define _log_dir        %{_var}/log/%{name}
 
 Name:           redis
-Version:        2.2.4
+Version:        2.2.7
 Release:        1
 #
 License:        BSD License
@@ -26,7 +26,7 @@ Group:          Productivity/Databases/Servers
 Summary:        Persistent key-value database
 Url:            http://redis.io/
 #
-Source:         http://redis.googlecode.com/files/%{name}-%{version}.tar.bz2
+Source:         http://redis.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:        %{name}.logrotate
 Source4:        redis.sysconfig
 #
diff --git a/skip-aof-test.patch b/skip-aof-test.patch
index 71acdb4..93438bc 100644
--- a/skip-aof-test.patch
+++ b/skip-aof-test.patch
@@ -1,5 +1,7 @@
---- redis-2.2.1/tests/test_helper.tcl.orig	2011-02-23 15:48:24.000000000 +0100
-+++ redis-2.2.1/tests/test_helper.tcl	2011-02-23 19:40:37.889522000 +0100
+Index: redis-2.2.7/tests/test_helper.tcl
+===================================================================
+--- redis-2.2.7.orig/tests/test_helper.tcl
++++ redis-2.2.7/tests/test_helper.tcl
 @@ -121,7 +121,7 @@ proc execute_everything {} {
      execute_tests "unit/cas"
      execute_tests "unit/quit"