From 5ced329fcb7f27acac6791cd3d0f33fa25958516a34d4951f393d0608282c87d Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Thu, 8 Aug 2013 02:09:08 +0000 Subject: [PATCH 1/2] - disable skip-aof-test.patch for now: it seems adding procps to the buildrequires also fixed that test. OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=47 --- redis.changes | 6 ++++++ redis.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/redis.changes b/redis.changes index 456c8a2..10f957c 100644 --- a/redis.changes +++ b/redis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 8 02:07:54 UTC 2013 - mrueckert@suse.de + +- disable skip-aof-test.patch for now: + it seems adding procps to the buildrequires also fixed that test. + ------------------------------------------------------------------- Wed Aug 7 14:37:30 UTC 2013 - mrueckert@suse.de diff --git a/redis.spec b/redis.spec index 4957f82..76004f4 100644 --- a/redis.spec +++ b/redis.spec @@ -55,7 +55,7 @@ different kind of sorting abilities. %setup -q %patch0 %patch1 -%patch2 +#patch2 %patch3 %build From 1c424c9206ac9e801b74e1392914a0a91dbc2e134c3e9c13d6cd2487bf43d384 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Thu, 8 Aug 2013 12:51:30 +0000 Subject: [PATCH 2/2] - drop skip-aof-test.patch OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=48 --- redis.changes | 5 +++++ redis.spec | 8 ++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/redis.changes b/redis.changes index 10f957c..3bbd100 100644 --- a/redis.changes +++ b/redis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 8 12:50:55 UTC 2013 - mrueckert@suse.de + +- drop skip-aof-test.patch + ------------------------------------------------------------------- Thu Aug 8 02:07:54 UTC 2013 - mrueckert@suse.de diff --git a/redis.spec b/redis.spec index 76004f4..ece4d7d 100644 --- a/redis.spec +++ b/redis.spec @@ -34,10 +34,7 @@ Source4: redis.sysconfig Patch0: %{name}-initscript.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: %{name}-conf.patch -# PATCH-FIX-UPSTREAM -- Fixed AOF: Server should have been started: Expected '1' to equal or match '0' -Patch2: skip-aof-test.patch -# for make test -Patch3: redis-enable-bactrace-on-x86-and-ia64-only.patch +Patch2: redis-enable-bactrace-on-x86-and-ia64-only.patch BuildRequires: tcl BuildRequires: procps Requires: logrotate @@ -55,8 +52,7 @@ different kind of sorting abilities. %setup -q %patch0 %patch1 -#patch2 -%patch3 +%patch2 %build make %{?_smp_mflags} CFLAGS="%{optflags}" V=1