From 09277511010f5f840b1e2df7415d9357cde2e53e Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sat, 1 Sep 2012 11:44:20 +0200
Subject: php-redis fix test server config for EL

---
 php-redis.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/php-redis.spec b/php-redis.spec
index e8955f1..8556497 100644
--- a/php-redis.spec
+++ b/php-redis.spec
@@ -133,7 +133,9 @@ cd nts/tests
 
 # Launch redis server
 mkdir -p {run,log,lib}/redis
-sed -s "s:/var:$PWD:" /etc/redis.conf >redis.conf
+sed -e "s:/var:$PWD:" \
+    -e "/daemonize/s/yes/no/" \
+    /etc/redis.conf >redis.conf
 %if 0%{?__isa_bits}
 # port number to allow 32/64 build at same time
 # and avoid conflict with a possible running server
@@ -153,7 +155,7 @@ php --no-php-ini \
     TestRedis.php || ret=1
 
 # Cleanup
-kill $srv
+kill $srv || :
 
 exit $ret
 %else
-- 
cgit