rpms/hddtemp/devel hddtemp.init, 1.1, 1.2 hddtemp.spec, 1.5, 1.6 hddtemp.sysconfig, 1.1, 1.2 sources, 1.3, 1.4

[Ville Skytta (scop)]

Changeset from: scop

Update of /cvs/extras/rpms/hddtemp/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv11770

Modified Files:
	hddtemp.init hddtemp.spec hddtemp.sysconfig sources 
Log Message:
Init script/ sysconfig cleanup, hddtemp.db 2004-11-30.


Index: hddtemp.init
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hddtemp.init	8 Nov 2004 04:33:28 -0000	1.1
+++ hddtemp.init	4 Dec 2004 22:43:31 -0000	1.2
@@ -21,14 +21,15 @@
 # Backwards compatibility.
 [ -z "$HDDTEMP_OPTIONS" -a -n "$HDDTEMPARGS" ] && \
   HDDTEMP_OPTIONS="$HDDTEMPARGS"
+HDDTEMP_OPTIONS="$HDDTEMP_OPTIONS $HDDTEMP_DAEMON_OPTIONS"
 
 exec="__SBINDIR__/hddtemp"
 prog=$(basename $exec)
 lockfile=__LOCKDIR__/subsys/$prog
 
 start() {
-    echo -n $"Starting $prog: "
-    daemon $exec -d $HDDTEMP_OPTIONS $HDDTEMP_DAEMON_OPTIONS
+    echo -n $"Starting hard disk temperature monitor daemon ($prog): "
+    daemon $exec -d $HDDTEMP_OPTIONS
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
@@ -36,7 +37,7 @@
 }
 
 stop() {
-    echo -n $"Stopping $prog: "
+    echo -n $"Stopping hard disk temperature monitor daemon ($prog): "
     killproc $prog
     retval=$?
     echo
@@ -49,33 +50,21 @@
     start
 }
 
-reload() {
-    restart
-}
-
-force_reload() {
-    restart
-}
-
-fdrstatus() {
-    status $prog
-}
-
 # See how we were called.
 case "$1" in
-    start|stop|restart|reload)
+    start|stop|restart)
         $1
         ;;
-    force-reload)
-        force_reload
+    reload|force-reload)
+        restart
         ;;
     status)
-        fdrstatus
+        status $prog
         ;;
-    condrestart)
+    try-restart|condrestart)
         [ ! -f $lockfile ] || restart
         ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
         exit 2
 esac


Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hddtemp.spec	8 Nov 2004 04:34:04 -0000	1.5
+++ hddtemp.spec	4 Dec 2004 22:43:31 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           hddtemp
 Version:        0.3
-Release:        0.fdr.0.10.beta12.2
+Release:        0.1.beta12
 Epoch:          0
 Summary:        Hard disk temperature tool
 
@@ -38,7 +38,8 @@
 
 
 %build
-%configure --with-db-path=%{_datadir}/misc/hddtemp.db
+%configure --disable-dependency-tracking \
+  --with-db-path=%{_datadir}/misc/hddtemp.db
 make %{?_smp_mflags}
 
 
@@ -63,7 +64,7 @@
 %post
 /sbin/chkconfig --add hddtemp
 if [ $1 -gt 1 ]; then
-  %{_initrddir}/hddtemp condrestart >/dev/null || :
+  %{_initrddir}/hddtemp try-restart >/dev/null || :
 fi
 
 %preun
@@ -91,6 +92,11 @@
 
 
 %changelog
+* Sat Dec  4 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3-0.1.beta12
+- Init script and sysconfig cleanups.
+- Build with dependency tracking disabled.
+- Update hddtemp.db to 2004-11-30.
+
 * Sat Oct  2 2004 Ville Skyttä <ville.skytta at iki.fi> 0:0.3-0.fdr.0.10.beta12
 - Update to 0.3 beta 12 and the latest db.
 


Index: hddtemp.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hddtemp.sysconfig	8 Nov 2004 04:33:28 -0000	1.1
+++ hddtemp.sysconfig	4 Dec 2004 22:43:31 -0000	1.2
@@ -1,10 +1,4 @@
 #
-# hddtemp options, for both command line and daemon use.
-# Put at least the disk(s) you want to monitor here.
+# hddtemp(8) daemon options.  Add at least the disk(s) you want to monitor here.
 #
-HDDTEMP_OPTIONS=""
-
-#
-# Options used only in daemon mode (when invoked by the init script).
-#
-HDDTEMP_DAEMON_OPTIONS="-l 127.0.0.1"
+HDDTEMP_OPTIONS="-l 127.0.0.1"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:34:04 -0000	1.3
+++ sources	4 Dec 2004 22:43:31 -0000	1.4
@@ -1,2 +1,2 @@
 51f19658fa6e745eee62f6e100838884  hddtemp-0.3-beta12.tar.bz2
-4cd1caa5573efae5eedd36ee91b41b2c  hddtemp.db
+0a5add4df5f20d8a7471bd48e6842762  hddtemp.db