packages: cronie/cronie.spec - rel 14 - keep service name same as SysV to a...

[baggins]

Author: baggins                      Date: Wed Feb  8 13:14:49 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 14
- keep service name same as SysV to avoid dead daemon after upgrade to systemd

---- Files affected:
packages/cronie:
   cronie.spec (1.56 -> 1.57) 

---- Diffs:

================================================================
Index: packages/cronie/cronie.spec
diff -u packages/cronie/cronie.spec:1.56 packages/cronie/cronie.spec:1.57
--- packages/cronie/cronie.spec:1.56	Wed Feb  8 12:37:58 2012
+++ packages/cronie/cronie.spec	Wed Feb  8 14:14:44 2012
@@ -18,7 +18,7 @@
 Summary:	Cron daemon for executing programs at set times
 Name:		cronie
 Version:	1.4.8
-Release:	13
+Release:	14
 License:	MIT and BSD and GPL v2
 Group:		Daemons
 Source0:	https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
@@ -137,8 +137,7 @@
 cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/crontab
 cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/crond
 cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/init/crond.conf
-cp -a %{SOURCE7} $RPM_BUILD_ROOT%{systemdunitdir}/cronie.service
-ln -s cronie.service $RPM_BUILD_ROOT%{systemdunitdir}/crond.service
+cp -a %{SOURCE7} $RPM_BUILD_ROOT%{systemdunitdir}/crond.service
 
 touch $RPM_BUILD_ROOT/var/log/cron
 
@@ -165,14 +164,14 @@
 fi
 /sbin/chkconfig --add crond
 %service crond restart "Cron Daemon"
-%systemd_post cronie.service
+%systemd_post crond.service
 
 %preun
 if [ "$1" = "0" ]; then
 	%service crond stop
 	/sbin/chkconfig --del crond
 fi
-%systemd_preun cronie.service
+%systemd_preun crond.service
 
 %postun
 if [ "$1" = "0" ]; then
@@ -193,7 +192,7 @@
 		echo "CROND_ARGS=\"$CROND_ARGS $__CROND_ARGS\"" >>/etc/sysconfig/cron
 	fi
 fi
-%systemd_trigger cronie.service
+%systemd_trigger crond.service
 
 %triggerun -- hc-cron,fcron,vixie-cron
 # Prevent preun from crond from working
@@ -224,7 +223,6 @@
 %attr(754,root,root) /etc/rc.d/init.d/crond
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/cron
 %{systemdunitdir}/crond.service
-%{systemdunitdir}/cronie.service
 %attr(755,root,root) %{_sbindir}/crond
 %attr(2755,root,crontab) %{_bindir}/crontab
 
@@ -257,6 +255,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2012/02/08 13:14:44  baggins
+- rel 14
+- keep service name same as SysV to avoid dead daemon after upgrade to systemd
+
 Revision 1.56  2012/02/08 11:37:58  baggins
 - rel 13
 - don't exit from trigger
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cronie/cronie.spec?r1=1.56&r2=1.57&f=u