diff --git a/.cvsignore b/.cvsignore index 40fb946..30c8b76 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cronie-1.3.tar.gz +cronie-1.4.tar.gz diff --git a/cronie.spec b/cronie.spec index 7eb2af3..b014b49 100644 --- a/cronie.spec +++ b/cronie.spec @@ -5,19 +5,16 @@ Summary: Cron daemon for executing programs at set times Name: cronie -Version: 1.3 -Release: 2%{?dist} -License: MIT and BSD +Version: 1.4 +Release: 1%{?dist} +License: MIT and BSD and GPLv2 Group: System Environment/Base URL: https://fedorahosted.org/cronie Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz -Patch0: reboot-alias-check-the-return-value.patch -#Source0: http://mmaslano.fedorapeople.org/cronie/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: syslog, bash >= 2.0 Requires: /usr/sbin/sendmail -Requires: anacron Conflicts: sysklogd < 1.4.1 Provides: vixie-cron = 4:4.4 Obsoletes: vixie-cron <= 4:4.3 @@ -46,9 +43,18 @@ scheduled times and related tools. It is a fork of the original vixie-cron and has security and configuration enhancements like the ability to use pam and SELinux. +%package anacron +Summary: Utility for running regular jobs +Requires: crontabs +Group: System Environment/Base + +%description anacron +Anacron becames part of cronie. Anacron is used only for running regular jobs. +The default settings execute regular jobs by anacron, however this could be +overloaded in settings. + %prep %setup -q -%patch0 -p1 %build @@ -63,8 +69,10 @@ SELinux. --with-audit \ %endif %if %{with inotify} ---with-inotify +--with-inotify \ %endif +--enable-anacron + make %{?_smp_mflags} %install @@ -80,6 +88,10 @@ mkdir -pm755 $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/ 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 -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 %clean rm -rf $RPM_BUILD_ROOT @@ -125,8 +137,21 @@ cp -a /var/lock/subsys/crond /var/lock/subsys/cronie > /dev/null 2>&1 ||: %endif %config(noreplace) %{_sysconfdir}/sysconfig/crond %config(noreplace) %{_sysconfdir}/cron.deny +%config(noreplace) %{_sysconfdir}/regularly-jobs + +%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.* +%{_mandir}/man5/anacrontab.* +%{_mandir}/man8/anacron.* %changelog +* Mon Jul 20 2009 Marcela Mašláňová - 1.4-1 +- merge cronie and anacron + * Thu Jun 18 2009 Marcela Mašláňová - 1.3-2 - 506560 check return value of access diff --git a/sources b/sources index 7dc124a..1410fc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dbb21448103e80c61d0a2c0f6ec2475c cronie-1.3.tar.gz +10728a81af9f5995a39bf541aaf14422 cronie-1.4.tar.gz