rpms/openhpi-subagent/devel openhpi-subagent-2.3.4-initd.patch, 1.1, 1.2 openhpi-subagent.spec, 1.8, 1.9

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/openhpi-subagent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5027

Modified Files:
	openhpi-subagent-2.3.4-initd.patch openhpi-subagent.spec 
Log Message:
* Fri Feb  5 2010 Dan Horák <dan[at]danny.cz> - 2.3.4-10
- updated the initscript patch (#521804)


openhpi-subagent-2.3.4-initd.patch:
 b/openhpi-subagent.rc |   20 ++++++++++++--------
 openhpi-subagent.rc   |    7 +++----
 2 files changed, 15 insertions(+), 12 deletions(-)

Index: openhpi-subagent-2.3.4-initd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi-subagent/devel/openhpi-subagent-2.3.4-initd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openhpi-subagent-2.3.4-initd.patch	28 Apr 2008 08:24:30 -0000	1.1
+++ openhpi-subagent-2.3.4-initd.patch	5 Feb 2010 15:02:56 -0000	1.2
@@ -1,11 +1,14 @@
-From cdcc003151bba6456830cc4f447525c60b3c7cc0 Mon Sep 17 00:00:00 2001
+From 6e27b8d0b72d2cc5cf752d26c447d7dc22bb4c5e Mon Sep 17 00:00:00 2001
 From: Dan Horak <dan at danny.cz>
 Date: Thu, 17 Apr 2008 15:55:04 +0200
-Subject: [PATCH] update the init.d script to Fedora/Red Hat standards
+Subject: [PATCH 1/2] update the init.d script to Fedora/Red Hat standards
 
+---
+ openhpi-subagent.rc |   19 ++++++++++++-------
+ 1 files changed, 12 insertions(+), 7 deletions(-)
 
 diff --git a/openhpi-subagent.rc b/openhpi-subagent.rc
-index 9485081..7a12f18 100755
+index 9485081..74c206b 100755
 --- a/openhpi-subagent.rc
 +++ b/openhpi-subagent.rc
 @@ -1,5 +1,5 @@
@@ -62,5 +65,38 @@ index 9485081..7a12f18 100755
     esac
  
 -- 
-1.5.4.1
+1.6.6
+
+
+From 73f13c5af1a3cbeecd145058e255490237c9a39b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Fri, 5 Feb 2010 14:46:07 +0100
+Subject: [PATCH 2/2] add try-restart action
+
+---
+ openhpi-subagent.rc |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/openhpi-subagent.rc b/openhpi-subagent.rc
+index 74c206b..3044c6a 100755
+--- a/openhpi-subagent.rc
++++ b/openhpi-subagent.rc
+@@ -88,12 +88,12 @@ else
+      restart|reload)
+ 	$0 stop && $0 start
+ 	;;
+-     condrestart)
++     condrestart|try-restart)
+ 	[ -f /var/lock/subsys/openhpi-subagent ] && $0 restart || :
+ 	;;
+      *)
+-	echo "Usage: $0 {start|stop|status|restart|condrestart|reload}"
+-	exit 1
++	echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"
++	exit 2
+    esac
+ 
+    exit $RETVAL
+-- 
+1.6.6
 


Index: openhpi-subagent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi-subagent/devel/openhpi-subagent.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- openhpi-subagent.spec	26 Oct 2009 10:15:15 -0000	1.8
+++ openhpi-subagent.spec	5 Feb 2010 15:02:56 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           openhpi-subagent
 Version:        2.3.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        NetSNMP subagent for OpenHPI
 
 Group:          System Environment/Base
@@ -69,6 +69,9 @@ fi
 %{_datadir}/snmp/mibs/*.mib
 
 %changelog
+* Fri Feb  5 2010 Dan Horák <dan[at]danny.cz> - 2.3.4-10
+- updated the initscript patch (#521804)
+
 * Mon Oct 26 2009 Dan Horák <dan[at]danny.cz> - 2.3.4-9
 - little update to the format patch for i386