rpms/vdradmin-am/devel vdradmin-am.init, 1.1, 1.2 vdradmin-am.spec, 1.6, 1.7

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21588

Modified Files:
	vdradmin-am.init vdradmin-am.spec 
Log Message:
* Mon Apr  2 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.5.3-2
- Use correct pid file in init script's daemon/killproc/status calls.
- Add /sbin/chkconfig dependencies for scriptlets.



Index: vdradmin-am.init
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/vdradmin-am.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdradmin-am.init	25 Oct 2006 09:23:37 -0000	1.1
+++ vdradmin-am.init	2 Apr 2007 15:03:34 -0000	1.2
@@ -21,10 +21,11 @@
 prog=$(basename $exec)
 
 lockfile=/var/lock/subsys/$prog
+pidfile=/var/run/vdradmin/$prog.pid
 
 start() {
     echo -n $"Starting $prog: "
-    daemon --user vdradmin "$exec >/dev/null 2>&1"
+    daemon --user=vdradmin --pidfile=$pidfile "$exec >/dev/null 2>&1"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
@@ -33,7 +34,7 @@
 
 stop() {
     echo -n $"Stopping $prog: "
-    killproc $prog
+    killproc -p $pidfile $prog
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
@@ -56,7 +57,7 @@
         exit 3 # LSB: not implemented
         ;;
     status)
-        status $prog
+        status -p $pidfile $prog
         ;;
     condrestart|try-restart)
   	[ ! -f $lockfile ] || restart


Index: vdradmin-am.spec
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/vdradmin-am.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vdradmin-am.spec	25 Jan 2007 17:00:50 -0000	1.6
+++ vdradmin-am.spec	2 Apr 2007 15:03:34 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           vdradmin-am
 Version:        3.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Web interface for VDR
 
 Group:          Applications/Internet
@@ -23,8 +23,11 @@
 BuildRequires:  gettext
 BuildRequires:  perl(Locale::gettext)
 Requires:       perl(Locale::gettext)
+Requires:       initscripts >= 8.22
 Requires(pre):  %{_sbindir}/groupadd
 Requires(pre):  %{_sbindir}/useradd
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
 
 %description
 VDRAdmin-AM is a web interface for managing VDR.  You will need access
@@ -119,6 +122,10 @@
 
 
 %changelog
+* Mon Apr  2 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.5.3-2
+- Use correct pid file in init script's daemon/killproc/status calls.
+- Add /sbin/chkconfig dependencies for scriptlets.
+
 * Thu Jan 25 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.5.3-1
 - 3.5.3.
 - Install UTF-8 locales too.