rpms/cpuspeed/devel cpuspeed.init,1.3,1.4 cpuspeed.spec,1.22,1.23

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/cpuspeed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18954

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
On shutdown, restore speed to maximum before daemon exit.



Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cpuspeed.init	24 Sep 2005 00:08:50 -0000	1.3
+++ cpuspeed.init	29 Sep 2005 23:46:47 -0000	1.4
@@ -48,8 +48,8 @@
 stop() {
 	if test "x`pidof cpuspeed`" != x; then
 		echo -n $"Stopping $prog: "
+		killproc cpuspeed -USR1
 		killproc cpuspeed -INT
-		sleep 1
 		echo
 	fi
 	if test "x`pidof cpuspeed`" != x; then


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cpuspeed.spec	23 Sep 2005 23:55:59 -0000	1.22
+++ cpuspeed.spec	29 Sep 2005 23:46:47 -0000	1.23
@@ -5,7 +5,7 @@
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL
-Source0:	cpuspeed-1.2.1.tar.gz
+Source0:	cpuspeed-%{version}.tar.gz
 Source1:	cpuspeed.init
 Buildroot:	%{_tmppath}/%{name}-%{version}-root
 Prereq:		/sbin/chkconfig /sbin/service
@@ -37,12 +37,12 @@
 mkdir -p %{buildroot}/etc/rc.d/init.d
 mkdir -p %{buildroot}/etc/sysconfig
 
-cd cpuspeed-1.2.1
+cd cpuspeed-%{version}
 make CFLAGS="$RPM_OPT_FLAGS -fpie -pie -Wl,-z,relro,-z,now"
 cd ..
 
 %install
-cd cpuspeed-1.2.1
+cd cpuspeed-%{version}
 install cpuspeed %{buildroot}/usr/sbin
 install %{SOURCE1} %{buildroot}/etc/rc.d/init.d/cpuspeed
 install cpuspeed.conf %{buildroot}/etc/cpuspeed.conf
@@ -72,6 +72,9 @@
 exit 0
 
 %changelog
+* Thu Sep 29 2005 Dave Jones <davej at redhat.com>
+- On shutdown, restore speed to maximum before daemon exit.
+
 * Fri Sep 23 2005 Dave Jones <davej at redhat.com>
 - Use ACPI as a fallback driver if possible, if one didn't get loaded. (#160788)