rpms/openhpi/F-11 openhpi-2.14.0-initscript.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 openhpi.spec, 1.72, 1.73 sources, 1.15, 1.16 openhpi-2.11.1-initd.patch, 1.1, NONE

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/openhpi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22267

Modified Files:
	.cvsignore openhpi.spec sources 
Added Files:
	openhpi-2.14.0-initscript.patch 
Removed Files:
	openhpi-2.11.1-initd.patch 
Log Message:
* Fri Apr 17 2009 Dan Horak <dan[at]danny.cz> - 2.14.0-1
- update to 2.14.0


openhpi-2.14.0-initscript.patch:

--- NEW FILE openhpi-2.14.0-initscript.patch ---
>From 0a9b838f4c53e0b69e93ba946e64e579dc6c5e17 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 17 Apr 2009 09:53:02 +0200
Subject: [PATCH] update initscript to Fedora standards

---
 openhpid/openhpid.sh.in |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/openhpid/openhpid.sh.in b/openhpid/openhpid.sh.in
index 3e7c578..bc66a38 100644
--- a/openhpid/openhpid.sh.in
+++ b/openhpid/openhpid.sh.in
@@ -6,14 +6,15 @@
 # Required-Stop:     $network $remote_fs $syslog
 # Should-Start:      $named
 # Should-Stop:       $named
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
+# Default-Start:
+# Default-Stop:      0 1 2 3 4 5 6
 # Short-Description: Start OpenHPI daemon at boot time
 # Description:       Enable OpenHPI service which is provided by openhpid.
 ### END INIT INFO
 #
 # openhpid.sh    Start/Stop the openhpi daemon.
 #
+# chkconfig: - 90 10
 # description: openhpid is standard UNIX program which uses the OpenHPI \
 #              APIs and provides a standard internet server to access those \
 #              APIs for client programs.
@@ -125,6 +126,8 @@ start() {
 	esac
         
 	print_outcome
+        
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/openhpid
 
 }
 
@@ -158,11 +161,7 @@ stop() {
 	
 	print_outcome
 	
-	if test "$RETVAL" -eq 0 && test -f /var/run/openhpid.pid
-	then
-		rm -f /var/lock/openhpid
-		rm -f /var/run/openhpid.pid
-	fi	
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/openhpid
 
 }	
 
@@ -210,11 +209,13 @@ restart() {
 	start
 }	
 
+condrestart() {
+	[ -f /var/lock/subsys/openhpid ] && restart || :
+}
+
 force_reload() {
-	echo -n $"Force-reload not supported."
-	echo
-	return 0
-}	
+	restart
+}
 
 # See how we were called.
 
@@ -228,6 +229,9 @@ case "$1" in
   restart)
   	restart
 	;;
+  condrestart|try-restart)
+  	condrestart
+	;;
   status)
   	dstatus
 	;;
@@ -235,6 +239,6 @@ case "$1" in
   	force_reload
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart|status|force-reload}"
+	echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|status|force-reload}"
 	exit 1
 esac
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	25 Feb 2009 20:28:41 -0000	1.15
+++ .cvsignore	17 Apr 2009 08:26:33 -0000	1.16
@@ -1 +1 @@
-openhpi-2.13.3.tar.gz
+openhpi-2.14.0.tar.gz


Index: openhpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/F-11/openhpi.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- openhpi.spec	4 Mar 2009 20:47:45 -0000	1.72
+++ openhpi.spec	17 Apr 2009 08:26:34 -0000	1.73
@@ -1,13 +1,13 @@
 Summary: Hardware Platform Interface library and tools
 Name: openhpi
-Version: 2.13.3
-Release: 2%{?dist}
+Version: 2.14.0
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openhpi.org
-Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: openhpi.conf
-Patch1: openhpi-2.11.1-initd.patch
+Patch0: openhpi-2.14.0-initscript.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libsysfs-devel, net-snmp-devel, OpenIPMI-devel, glib2-devel
 BuildRequires: libtool-ltdl-devel, openssl-devel, ncurses-devel
@@ -53,7 +53,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .initd
+%patch0 -p1 -b .initscript
 
 # fix permissions
 chmod a-x plugins/simulator/*.[ch]
@@ -71,11 +71,6 @@
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-# temp hack for glib2
-%ifarch ppc ppc64
-find . -name Makefile | xargs sed -i 's/ -Werror//g'
-%endif
-
 make %{?_smp_mflags}
 
 
@@ -124,7 +119,7 @@
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING README README.daemon docs/hld/openhpi-manual openhpi.conf.example
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
@@ -139,11 +134,11 @@
 %{_mandir}/man8/*
 
 %files libs
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/*.so
 %{_includedir}/%{name}
@@ -151,6 +146,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Dan Horak <dan[at]danny.cz> - 2.14.0-1
+- update to 2.14.0
+
 * Wed Feb 25 2009 Dan Horak <dan[at]danny.cz> - 2.13.3-2
 - fix ppc/ppc64 builds
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	25 Feb 2009 20:28:41 -0000	1.15
+++ sources	17 Apr 2009 08:26:34 -0000	1.16
@@ -1 +1 @@
-1916b2430d13b03abb93d384c5c431a0  openhpi-2.13.3.tar.gz
+390422aed5f3132afeef1225f76b6081  openhpi-2.14.0.tar.gz


--- openhpi-2.11.1-initd.patch DELETED ---