rpms/lm_sensors/devel lm_sensors.init, 1.5, 1.6 lm_sensors.spec, 1.30, 1.31

[fedora-cvs-commits at redhat.com]

Author: pjones

Update of /cvs/dist/rpms/lm_sensors/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4436

Modified Files:
	lm_sensors.init lm_sensors.spec 
Log Message:
- fix subsys locking in the initscript



Index: lm_sensors.init
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lm_sensors.init	23 Dec 2004 15:07:20 -0000	1.5
+++ lm_sensors.init	16 Jan 2006 17:29:20 -0000	1.6
@@ -67,7 +67,7 @@
         $PSENSORS -s
 
 	RETVAL=$?
-	if [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sensors ; then
+	if [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lm_sensors ; then
 		echo_success
 		echo
 	else
@@ -88,7 +88,7 @@
 	done
 
 	RETVAL=$?
-	if [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sensors ; then
+	if [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/lm_sensors ; then
 		echo_success
 		echo
 	else
@@ -109,7 +109,7 @@
 }
 
 condrestart() {
-	[ -e /var/lock/subsys/sensors ] && restart || :
+	[ -e /var/lock/subsys/lm_sensors ] && restart || :
 }
 
 # See how we were called.


Index: lm_sensors.spec
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- lm_sensors.spec	16 Dec 2005 23:21:30 -0000	1.30
+++ lm_sensors.spec	16 Jan 2006 17:29:20 -0000	1.31
@@ -1,6 +1,6 @@
 Name: lm_sensors
 Version: 2.9.1
-Release: 5.1
+Release: 6
 URL: http://secure.netroedge.com/~lm78/
 Source: http://secure.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz
 Source1: lm_sensors.sysconfig
@@ -72,6 +72,11 @@
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
 
+%pre
+if [ -f /var/lock/subsys/sensors ]; then
+	mv -f /var/lock/subsys/sensors /var/lock/subsys/lm_sensors
+fi
+
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add lm_sensors
@@ -102,7 +107,10 @@
 %{_libdir}/lib*.so
 
 %changelog
-* Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
+* Mon Jan 16 2006 Peter Jones <pjones at redhat.com> 2.9.1-6
+- fix initscript subsys locking
+
+* Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com> 2.9.1-5.1
 - rebuilt for new gcj
 
 * Tue Nov 08 2005 Phil Knirsch <pknirsch at redhat.com> 2.9.1-5