From 70fa5fb44d9dca047359f119d19bd079e519fe5fbdd011a0651c8064ba061b36 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <prusnak@opensuse.org>
Date: Fri, 5 Mar 2010 12:30:26 +0000
Subject: [PATCH] Accepting request 34154 from home:pzb

Copy from home:pzb/redis via accept of submit request 34154 revision 5.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/34154
OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=4
---
 redis-initscript.patch | 17 ++++++++++++-----
 redis.changes          |  6 ++++++
 redis.spec             |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/redis-initscript.patch b/redis-initscript.patch
index cf45e1e..391f520 100644
--- a/redis-initscript.patch
+++ b/redis-initscript.patch
@@ -1,7 +1,5 @@
-Index: utils/redis_init_script
-===================================================================
---- utils/redis_init_script.orig
-+++ utils/redis_init_script
+--- 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
 @@ -1,7 +1,18 @@
  #!/bin/sh
 +### BEGIN INIT INFO
@@ -22,7 +20,16 @@ Index: utils/redis_init_script
  
  PIDFILE=/var/run/redis_${REDISPORT}.pid
  CONF="/etc/redis/${REDISPORT}.conf"
-@@ -33,4 +44,7 @@ case "$1" in
+@@ -22,7 +33,7 @@
+                 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 &
+                 PID=$(cat $PIDFILE)
+                 while [ -x /proc/${PIDFILE} ]
+                 do
+@@ -33,4 +44,7 @@
                  echo "Redis stopped"
          fi
          ;;
diff --git a/redis.changes b/redis.changes
index de14f9c..b4036fb 100644
--- a/redis.changes
+++ b/redis.changes
@@ -1,3 +1,9 @@
+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)
+
 -------------------------------------------------------------------
 Thu Jan 21 16:32:45 UTC 2010 - prusnak@suse.cz
 
diff --git a/redis.spec b/redis.spec
index 0c112cf..8b92357 100644
--- a/redis.spec
+++ b/redis.spec
@@ -24,7 +24,7 @@ Summary:        Persistent key-value database with built-in net interface
 Source:         http://redis.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:         %{name}-initscript.patch
 # for init script
-Requires:       netcat-openbsd
+Requires:       netcat
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description