rpms/cronie/devel .cvsignore, 1.6, 1.7 cronie.spec, 1.23, 1.24 sources, 1.6, 1.7 0001-Update-manual-for-symlink.patch, 1.1, NONE reboot-alias-check-the-return-value.patch, 1.1, NONE

[Marcela Mašláňová]

Author: mmaslano

Update of /cvs/pkgs/rpms/cronie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31467

Modified Files:
	.cvsignore cronie.spec sources 
Removed Files:
	0001-Update-manual-for-symlink.patch 
	reboot-alias-check-the-return-value.patch 
Log Message:
* Fri Aug 14 2009 Marcela Mašláňová <mmaslano at redhat.com> - 1.4.1-1
- update to 1.4.1
- create and own /var/spool/anacron/cron.{daily,weekly,monthly} to
 remove false warning about non existent files
- Resolves: 517398



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	20 Jul 2009 18:12:36 -0000	1.6
+++ .cvsignore	14 Aug 2009 12:47:30 -0000	1.7
@@ -1 +1 @@
-cronie-1.4.tar.gz
+cronie-1.4.1.tar.gz


Index: cronie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/cronie.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- cronie.spec	5 Aug 2009 16:51:09 -0000	1.23
+++ cronie.spec	14 Aug 2009 12:47:30 -0000	1.24
@@ -5,8 +5,8 @@
 
 Summary: Cron daemon for executing programs at set times
 Name: cronie
-Version: 1.4
-Release: 4%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 License: MIT and BSD and GPLv2
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
@@ -90,16 +90,23 @@ mkdir -pm755 $RPM_BUILD_ROOT%{_sysconfdi
 install -m 755 cronie.init $RPM_BUILD_ROOT%{_initrddir}/crond
 install -m 644 crond.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/crond
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cron.deny
-install -m 644 contrib/regularly-jobs $RPM_BUILD_ROOT%{_sysconfdir}/regularly-jobs
+install -m 644 contrib/anacrontab $RPM_BUILD_ROOT%{_sysconfdir}/anacrontab
 install -c -m755 contrib/0hourly $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/0hourly
 mkdir -pm 755 $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly
 install -c -m755 contrib/0anacron $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/0anacron
+mkdir -p $RPM_BUILD_ROOT/var/spool/anacron
+touch $RPM_BUILD_ROOT/var/spool/anacron/cron.daily
+touch $RPM_BUILD_ROOT/var/spool/anacron/cron.weekly
+touch $RPM_BUILD_ROOT/var/spool/anacron/cron.monthly
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add crond
+[ -e /var/spool/anacron/cron.daily ] || touch /var/spool/anacron/cron.daily
+[ -e /var/spool/anacron/cron.weekly ] || touch /var/spool/anacron/cron.weekly
+[ -e /var/spool/anacron/cron.monthly ] || touch /var/spool/anacron/cron.monthly
 
 %preun
 if [ "$1" = "0" ]; then
@@ -112,6 +119,15 @@ if [ "$1" -ge "1" ]; then
     service crond condrestart > /dev/null 2>&1 ||:
 fi
 
+# empty /etc/crontab in case there are only old regular jobs
+%triggerun -- cronie < 1.4.1
+cp -a /etc/crontab /etc/crontab.rpmsave
+sed -e '/^01 \* \* \* \* root run-parts \/etc\/cron\.hourly/d'\
+  -e '/^02 4 \* \* \* root run-parts \/etc\/cron\.daily/d'\
+  -e '/^22 4 \* \* 0 root run-parts \/etc\/cron\.weekly/d'\
+  -e '/^42 4 1 \* \* root run-parts \/etc\/cron\.monthly/d' /etc/crontab.rpmsave > /etc/crontab
+exit 0
+
 #copy the lock, remove old daemon from chkconfig
 %triggerun -- vixie-cron
 cp -a /var/lock/subsys/crond /var/lock/subsys/cronie > /dev/null 2>&1 ||:
@@ -139,18 +155,27 @@ cp -a /var/lock/subsys/crond /var/lock/s
 %endif
 %config(noreplace) %{_sysconfdir}/sysconfig/crond
 %config(noreplace) %{_sysconfdir}/cron.deny
-%config(noreplace) %{_sysconfdir}/regularly-jobs
+%config(noreplace) %{_sysconfdir}/anacrontab
 
 %files anacron
 %defattr(-,root,root,-)
 %{_sbindir}/anacron
 %attr(0644,root,root) %{_sysconfdir}/cron.d/0hourly
 %attr(0755,root,root) %{_sysconfdir}/cron.hourly/0anacron
-%{_mandir}/man5/regularly-jobs.*
+%dir /var/spool/anacron
+%ghost %verify(not md5 size mtime) /var/spool/anacron/cron.daily
+%ghost %verify(not md5 size mtime) /var/spool/anacron/cron.weekly
+%ghost %verify(not md5 size mtime) /var/spool/anacron/cron.monthly
 %{_mandir}/man5/anacrontab.*
 %{_mandir}/man8/anacron.*
 
 %changelog
+* Fri Aug 14 2009 Marcela Mašláňová <mmaslano at redhat.com> - 1.4.1-1
+- update to 1.4.1
+- create and own /var/spool/anacron/cron.{daily,weekly,monthly} to
+ remove false warning about non existent files
+- Resolves: 517398
+
 * Wed Aug  5 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-4
 - 515762 move anacron provides and obsoletes to the anacron subpackage
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	20 Jul 2009 18:12:36 -0000	1.6
+++ sources	14 Aug 2009 12:47:30 -0000	1.7
@@ -1 +1 @@
-10728a81af9f5995a39bf541aaf14422  cronie-1.4.tar.gz
+9c089d2035b9fa8263bc71da3eb31cdd  cronie-1.4.1.tar.gz


--- 0001-Update-manual-for-symlink.patch DELETED ---


--- reboot-alias-check-the-return-value.patch DELETED ---