SPECS: mcron.spec - fix chkconfig deps, use %service

[glen]

Author: glen                         Date: Thu Apr 20 16:32:37 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix chkconfig deps, use %service

---- Files affected:
SPECS:
   mcron.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/mcron.spec
diff -u SPECS/mcron.spec:1.9 SPECS/mcron.spec:1.10
--- SPECS/mcron.spec:1.9	Thu Sep 29 19:39:36 2005
+++ SPECS/mcron.spec	Thu Apr 20 18:32:32 2006
@@ -17,15 +17,16 @@
 #Source4:	%{name}.crontab
 URL:		http://www.gnu.org/software/mcron/
 BuildRequires:	guile-devel
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 BuildRequires:	texinfo
-PreReq:		rc-scripts
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/groupadd
+Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
 Requires:	/bin/run-parts
+Requires:	rc-scripts
 Provides:	crondaemon
 Provides:	crontabs
 Provides:	group(crontab)
@@ -78,16 +79,16 @@
 
 install mcron.info $RPM_BUILD_ROOT%{_infodir}/%{name}.info
 
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/cron/cron.allow << EOF
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/cron/cron.allow << 'EOF'
 # cron.allow	This file describes the names of the users which are
 #		allowed to use the local cron daemon
 root
 EOF
 
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/cron/cron.deny << EOF2
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/cron/cron.deny << 'EOF'
 # cron.deny	This file describes the names of the users which are
 #		NOT allowed to use the local cron daemon
-EOF2
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,11 +98,7 @@
 
 %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
+%service crond restart "cron daemon"
 umask 027
 touch /var/log/cron
 chgrp crontab /var/log/cron
@@ -110,9 +107,7 @@
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/crond ]; then
-		/etc/rc.d/init.d/crond stop >&2
-	fi
+	%service crond stop
 	/sbin/chkconfig --del crond
 fi
 
@@ -136,6 +131,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/04/20 16:32:32  glen
+- fix chkconfig deps, use %service
+
 Revision 1.9  2005/09/29 17:39:36  glen
 - note about missing files (serek?)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mcron.spec?r1=1.9&r2=1.10&f=u