SPECS: vixie-cron.spec, hc-cron.spec - use %service; adapterized

[glen]

Author: glen                         Date: Wed Nov 30 18:39:36 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service; adapterized

---- Files affected:
SPECS:
   vixie-cron.spec (1.114 -> 1.115) , hc-cron.spec (1.96 -> 1.97) 

---- Diffs:

================================================================
Index: SPECS/vixie-cron.spec
diff -u SPECS/vixie-cron.spec:1.114 SPECS/vixie-cron.spec:1.115
--- SPECS/vixie-cron.spec:1.114	Mon Sep 12 12:47:19 2005
+++ SPECS/vixie-cron.spec	Wed Nov 30 19:39:31 2005
@@ -55,15 +55,16 @@
 Patch15:	%{name}-saved-uids.patch
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	pam-devel
-BuildRequires:	rpmbuild(macros) >= 1.202
-PreReq:		rc-scripts
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/groupadd
-Requires(post,preun):	/sbin/chkconfig
+BuildRequires:	rpmbuild(macros) >= 1.247
 Requires(post):	fileutils
+Requires(post,preun):	/sbin/chkconfig
+Requires(post,preun):	rc-scripts
 Requires(postun):	/usr/sbin/groupdel
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
 Requires:	/bin/run-parts
 Requires:	psmisc >= 20.1
+Requires:	rc-scripts
 Provides:	crontabs >= 1.7
 Provides:	crondaemon
 Provides:	group(crontab)
@@ -256,15 +257,11 @@
 
 %post
 /sbin/chkconfig --add crond
-if [ -f /var/lock/subsys/crond ]; then
-	/etc/rc.d/init.d/crond restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/crond start\" to start cron daemon."
-fi
 umask 027
 touch /var/log/cron
 chgrp crontab /var/log/cron
 chmod 660 /var/log/cron
+%service crond restart "cron daemon"
 
 %preun
 if [ "$1" = "0" ]; then
@@ -356,6 +353,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.115  2005/11/30 18:39:31  glen
+- use %service; adapterized
+
 Revision 1.114  2005/09/12 10:47:19  hawk
 - disabled file mode checking for /etc/cron.d (in crond.patch)
 - fixed swap_uids_back() to restore uids propely

================================================================
Index: SPECS/hc-cron.spec
diff -u SPECS/hc-cron.spec:1.96 SPECS/hc-cron.spec:1.97
--- SPECS/hc-cron.spec:1.96	Wed Nov 30 19:28:51 2005
+++ SPECS/hc-cron.spec	Wed Nov 30 19:39:31 2005
@@ -22,14 +22,16 @@
 Patch3:		%{name}-closefile.patch
 Patch4:		%{name}-sgid.patch
 Patch5:		%{name}-sleep.patch
-PreReq:		rc-scripts
-PreReq:		/sbin/chkconfig
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.247
+Requires(post,preun):	/sbin/chkconfig
+Requires(post,preun):	rc-scripts
+Requires(postun):	/usr/sbin/groupdel
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
-Requires(postun):	/usr/sbin/groupdel
 Requires:	/bin/run-parts
+Requires:	/sbin/chkconfig
 Requires:	psmisc >= 20.1
+Requires:	rc-scripts
 Provides:	crontabs
 Provides:	crondaemon
 Provides:	group(crontab)
@@ -119,17 +121,11 @@
 
 %post
 /sbin/chkconfig --add crond
-if [ -f /var/lock/subsys/crond ]; then
-	/etc/rc.d/init.d/crond restart >&2
-else
-	%banner %{name} -e <<EOF
-Run "/etc/rc.d/init.d/crond start" to start cron daemon.
-EOF
-fi
 umask 027
 touch /var/log/cron
 chgrp crontab /var/log/cron
 chmod 660 /var/log/cron
+%service crond restart "cron daemon"
 
 %preun
 if [ "$1" = "0" ]; then
@@ -195,6 +191,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.97  2005/11/30 18:39:31  glen
+- use %service; adapterized
+
 Revision 1.96  2005/11/30 18:28:51  glen
 - quotes not neccessary with %banner
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/vixie-cron.spec?r1=1.114&r2=1.115&f=u
    http://cvs.pld-linux.org/SPECS/hc-cron.spec?r1=1.96&r2=1.97&f=u