packages: ibmusbasm/ibmusbasm.init, ibmusbasm/ibmusbasm.spec - update to 1....

[glen]

Author: glen                         Date: Wed Jun 17 02:50:37 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update to 1.46
- use same lock/pidfile that the daemon itself does for consistency

---- Files affected:
packages/ibmusbasm:
   ibmusbasm.init (1.3 -> 1.4) , ibmusbasm.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/ibmusbasm/ibmusbasm.init
diff -u packages/ibmusbasm/ibmusbasm.init:1.3 packages/ibmusbasm/ibmusbasm.init:1.4
--- packages/ibmusbasm/ibmusbasm.init:1.3	Wed Jun 17 04:32:56 2009
+++ packages/ibmusbasm/ibmusbasm.init	Wed Jun 17 04:50:31 2009
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# ibmasm        This shell script takes care of starting and stopping \
+# ibmusbasm        This shell script takes care of starting and stopping \
 #               the IBM Remote Supervisor Adapter II daemon.
 #
 # chkconfig: 2345 85 15
@@ -16,36 +16,36 @@
 . /etc/rc.d/init.d/functions
 
 # Get service config - may override defaults
-[ -f /etc/sysconfig/ibmasm ] && . /etc/sysconfig/ibmasm
+[ -f /etc/sysconfig/ibmusbasm ] && . /etc/sysconfig/ibmusbasm
 
 start() {
 	# Check if the service is already running?
-	if [ -f /var/lock/subsys/ibmasm ]; then
+	if [ -f /var/lock/subsys/ibmusbasm ]; then
 		msg_already_running "IBM Remote Supervisor Adapter"
 		return
 	fi
 
 	msg_starting "IBM Remote Supervisor Adapter"
 	# start the daemon in the background
-	daemon --fork /sbin/ibmasm
+	daemon --fork /sbin/ibmusbasm
 	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ibmasm
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ibmusbasm
 }
 
 stop() {
-	if [ ! -f /var/lock/subsys/ibmasm ]; then
+	if [ ! -f /var/lock/subsys/ibmusbasm ]; then
 		msg_not_running "IBM Remote Supervisor Adapter"
 		return
 	fi
 
 	# Stop daemons.
 	msg_stopping "IBM Remote Supervisor Adapter"
-	killproc --pidfile /var/run/ibmusbasm.pid ibmasm -TERM
-	rm -f /var/lock/subsys/ibmasm
+	killproc --pidfile /var/run/ibmusbasm.pid ibmusbasm -TERM
+	rm -f /var/lock/subsys/ibmusbasm
 }
 
 condrestart() {
-	if [ ! -f /var/lock/subsys/ibmasm ]; then
+	if [ ! -f /var/lock/subsys/ibmusbasm ]; then
 		msg_not_running "IBM Remote Supervisor Adapter"
 		RETVAL=$1
 		return
@@ -75,7 +75,7 @@
 	condrestart 7
 	;;
   status)
-	status ibmasm
+	status ibmusbasm
 	RETVAL=$?
 	;;
   *)

================================================================
Index: packages/ibmusbasm/ibmusbasm.spec
diff -u packages/ibmusbasm/ibmusbasm.spec:1.8 packages/ibmusbasm/ibmusbasm.spec:1.9
--- packages/ibmusbasm/ibmusbasm.spec:1.8	Wed Jun 17 04:36:59 2009
+++ packages/ibmusbasm/ibmusbasm.spec	Wed Jun 17 04:50:31 2009
@@ -1,15 +1,17 @@
 # $Revision$, $Date$
+# NOTE
+# - the shared library built here isn't used by the daemon, drop as not worth of it?
 Summary:	IBM Remote Supervisor Adapter (RSA) II daemon
 Summary(pl.UTF-8):	Demon IBM Remote Supervisor Adapter (RSA) II
 Name:		ibmusbasm
-Version:	1.42
-Release:	2
+Version:	1.46
+Release:	0.1
 License:	GPL
 Group:		Applications
-Source0:	ftp://ftp.software.ibm.com/systems/support/system_x/ibm_svc_rsa2_hlp242b_linux_32-64.tgz
-# Source0-md5:	8b08d5cf722c812e607f99ce852f62f7
-Source1:	ibmasm.init
-URL:		http://www-304.ibm.com/jct01004c/systems/support/supportsite.wss/docdisplay?lndocid=MIGR-5071676&brandind=5000008
+Source0:	ftp://ftp.software.ibm.com/systems/support/system_x/ibm_svc_rsa2_hlp246a_linux_32-64.tgz
+# Source0-md5:	68ca47671c98a9a174eaf8b31d658272
+Source1:	ibmusbasm.init
+URL:		http://www-947.ibm.com/systems/support/supportsite.wss/docdisplay?lndocid=MIGR-5071676&brandind=5000008
 BuildRequires:	libusb-devel >= 0.1.6
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	sed >= 4.0
@@ -59,7 +61,7 @@
 install -d $RPM_BUILD_ROOT{%{_libdir},%{_sbindir},%{_sysconfdir},/etc/rc.d/init.d}
 install ibmusbasm-src/shlib/libsysSp.so.1 $RPM_BUILD_ROOT%{_libdir}
 install ibmusbasm-src/src/ibmasm $RPM_BUILD_ROOT%{_sbindir}
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ibmasm
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ibmusbasm
 ln -s libsysSp.so.1 $RPM_BUILD_ROOT%{_libdir}/libsysSp.so
 
 %clean
@@ -67,12 +69,12 @@
 
 %post
 /sbin/ldconfig
-/sbin/chkconfig --add ibmasm
-%service ibmasm restart
+/sbin/chkconfig --add ibmusbasm
+%service ibmusbasm restart
 
 if [ "$1" = "0" ]; then
-	%service -q ibmasm stop
-	/sbin/chkconfig --del ibmasm
+	%service -q ibmusbasm stop
+	/sbin/chkconfig --del ibmusbasm
 fi
 
 %postun	-p /sbin/ldconfig
@@ -80,7 +82,7 @@
 %files
 %defattr(644,root,root,755)
 %doc readme.txt
-%attr(754,root,root) /etc/rc.d/init.d/ibmasm
+%attr(754,root,root) /etc/rc.d/init.d/ibmusbasm
 %attr(755,root,root) %{_libdir}/libsysSp.so
 %attr(755,root,root) %{_libdir}/libsysSp.so.1
 %attr(755,root,root) %{_sbindir}/ibmasm
@@ -91,6 +93,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2009/06/17 02:50:31  glen
+- update to 1.46
+- use same lock/pidfile that the daemon itself does for consistency
+
 Revision 1.8  2009/06/17 02:36:59  glen
 - libusb version from readme.txt
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ibmusbasm/ibmusbasm.init?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ibmusbasm/ibmusbasm.spec?r1=1.8&r2=1.9&f=u