Author: baggins Date: Sun Feb 5 16:14:46 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 9 - merge systemd stuff into main package
---- Files affected: packages/cronie: cronie.spec (1.51 -> 1.52) ---- Diffs: ================================================================ Index: packages/cronie/cronie.spec diff -u packages/cronie/cronie.spec:1.51 packages/cronie/cronie.spec:1.52 --- packages/cronie/cronie.spec:1.51 Sat Feb 4 23:26:15 2012 +++ packages/cronie/cronie.spec Sun Feb 5 17:14:41 2012 @@ -18,7 +18,7 @@ Summary: Cron daemon for executing programs at set times Name: cronie Version: 1.4.8 -Release: 8 +Release: 9 License: MIT and BSD and GPL v2 Group: Daemons Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz @@ -49,6 +49,7 @@ Requires: /bin/run-parts Requires: psmisc >= 20.1 Requires: rc-scripts >= 0.4.3.0 +Requires: systemd-units >= 37-0.10 %{?with_inotify:Requires: uname(release) >= 2.6.13} Provides: crondaemon Provides: crontabs = 1.7 @@ -93,15 +94,6 @@ %description upstart -l pl.UTF-8 Opis zadania Upstart dla Cronie. -%package systemd -Summary: systemd units for cronie -Group: Base -Requires: %{name} = %{version}-%{release} -Requires: systemd-units >= 37-0.10 - -%description systemd -systemd units for cronie. - %prep %setup -q %patch0 -p1 @@ -172,17 +164,23 @@ fi /sbin/chkconfig --add crond %service crond restart "Cron Daemon" +%systemd_post cronie.service %preun if [ "$1" = "0" ]; then %service crond stop /sbin/chkconfig --del crond fi +%systemd_preun cronie.service %postun if [ "$1" = "0" ]; then %groupremove crontab fi +%systemd_reload + +%triggerpostun -- cronie < 1.4.8-9 +%systemd_trigger cronie.service %triggerun -- hc-cron,fcron,vixie-cron # Prevent preun from crond from working @@ -201,15 +199,6 @@ %postun upstart %upstart_postun crond -%post systemd -%systemd_post cronie.service - -%preun systemd -%systemd_preun cronie.service - -%postun systemd -%systemd_reload - %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog README @@ -221,6 +210,8 @@ %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/crond %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 @@ -247,17 +238,16 @@ %config(noreplace) %verify(not md5 mtime size) /etc/init/crond.conf %endif -%files systemd -%defattr(644,root,root,755) -%{systemdunitdir}/crond.service -%{systemdunitdir}/cronie.service - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.52 2012/02/05 16:14:41 baggins +- rel 9 +- merge systemd stuff into main package + Revision 1.51 2012/02/04 22:26:15 blues - macro ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cronie/cronie.spec?r1=1.51&r2=1.52&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
