From a327cce1102b4ee23888a9d34470a638a04cfbc856bec0ad42dd45ab4df792e6 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Sat, 22 Oct 2011 08:32:19 +0000
Subject: [PATCH] Accepting request 88557 from
 home:vintozver:branches:server:database

Update to version 2.4.1
Please note that docs are not included in sources from this version :(

OBS-URL: https://build.opensuse.org/request/show/88557
OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=22
---
 redis-2.2.14.tar.gz |  3 ---
 redis-2.4.1.tar.gz  |  3 +++
 redis.spec          |  7 ++++---
 skip-aof-test.patch | 30 +++++++++++-------------------
 4 files changed, 18 insertions(+), 25 deletions(-)
 delete mode 100644 redis-2.2.14.tar.gz
 create mode 100644 redis-2.4.1.tar.gz

diff --git a/redis-2.2.14.tar.gz b/redis-2.2.14.tar.gz
deleted file mode 100644
index d626b37..0000000
--- a/redis-2.2.14.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:212d8e6f8f3bdfee71697d6e1ec41caa3365d24d57108992d221f722eb45402d
-size 455988
diff --git a/redis-2.4.1.tar.gz b/redis-2.4.1.tar.gz
new file mode 100644
index 0000000..e524395
--- /dev/null
+++ b/redis-2.4.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38e02d21f7a5137089f8513490a61efa51e1222e94cee1cb19246305444a0902
+size 618821
diff --git a/redis.spec b/redis.spec
index e277934..f9c42c7 100644
--- a/redis.spec
+++ b/redis.spec
@@ -18,7 +18,7 @@
 %define _log_dir        %{_var}/log/%{name}
 
 Name:           redis
-Version:        2.2.14
+Version:        2.4.1
 Release:        1
 #
 License:        BSD License
@@ -67,7 +67,8 @@ HTML documentation for redis database.
 # Failures: - Fixed AOF: Server should have been started: Expected '1' to equal or match '0'
 %patch2 -p1
 
-mv doc html
+# Documents are not available in this build
+#mv doc html
 
 %build
 make PROF="%{optflags}" %{?jobs:-j%jobs}
@@ -145,6 +146,6 @@ echo " sudo rcredis start; insserv redis"
 
 %files doc
 %defattr(-,root,root)
-%doc html/
+%doc 00-RELEASENOTES BUGS CONTRIBUTING COPYING Changelog README TODO
 
 %changelog
diff --git a/skip-aof-test.patch b/skip-aof-test.patch
index b192f18..7f48967 100644
--- a/skip-aof-test.patch
+++ b/skip-aof-test.patch
@@ -1,19 +1,11 @@
-*** redis-2.2.14/tests/test_helper.tcl.orig	2011-10-11 10:49:53.526776515 +0300
---- redis-2.2.14/tests/test_helper.tcl	2011-10-11 10:50:30.166776516 +0300
-***************
-*** 122,128 ****
-      execute_tests "unit/cas"
-      execute_tests "unit/quit"
-      execute_tests "integration/replication"
-!     execute_tests "integration/aof"
-  #    execute_tests "integration/redis-cli"
-      execute_tests "unit/pubsub"
-      execute_tests "unit/slowlog"
---- 122,128 ----
-      execute_tests "unit/cas"
-      execute_tests "unit/quit"
-      execute_tests "integration/replication"
-! #    execute_tests "integration/aof"
-  #    execute_tests "integration/redis-cli"
-      execute_tests "unit/pubsub"
-      execute_tests "unit/slowlog"
+--- redis-2.4.1/tests/test_helper.tcl.orig	2011-10-11 10:49:53.526776515 +0300
++++ redis-2.4.1/tests/test_helper.tcl	2011-10-11 10:50:30.166776516 +0300
+@@ -28,7 +28,7 @@
+     integration/replication
+     integration/replication-2
+     integration/replication-3
+-    integration/aof
++    # integration/aof
+     unit/pubsub
+     unit/slowlog
+     unit/maxmemory