diff --git a/.cvsignore b/.cvsignore index c32f57e..0fcdc5a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ 000-delay.cron +config diff --git a/crontabs.spec b/crontabs.spec index 9381610..8de3b3d 100644 --- a/crontabs.spec +++ b/crontabs.spec @@ -1,12 +1,13 @@ Summary: Root crontab files used to schedule the execution of programs Name: crontabs Version: 1.10 -Release: 14%{?dist} -License: Public Domain +Release: 15%{?dist} +License: Public Domain and GPLv2 Group: System Environment/Base Source0: crontab Source1: run-parts Source2: 000-delay.cron +Source3: config BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -24,7 +25,8 @@ your system. rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/cron.{hourly,daily,weekly,monthly} mkdir -p $RPM_BUILD_ROOT/usr/bin - +mkdir -p $RPM_BUILD_ROOT/etc/sysconfig +cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/crontab install -m644 $RPM_SOURCE_DIR/crontab $RPM_BUILD_ROOT/etc/crontab install -m755 $RPM_SOURCE_DIR/run-parts $RPM_BUILD_ROOT/usr/bin/run-parts install -m755 $RPM_SOURCE_DIR/000-delay.cron $RPM_BUILD_ROOT/etc/cron.daily/000-delay.cron @@ -35,7 +37,7 @@ ln -s ../cron.daily/000-delay.cron $RPM_BUILD_ROOT/etc/cron.monthly/000-delay.cr rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %config(noreplace) /etc/crontab /usr/bin/run-parts %dir /etc/cron.hourly @@ -45,8 +47,15 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/cron.daily/000-delay.cron %dir /etc/cron.weekly/000-delay.cron %dir /etc/cron.monthly/000-delay.cron +%config(noreplace) /etc/sysconfig/crontab %changelog +* Tue Aug 21 2007 Marcela Maslanova 1.10-15 +- corrected license tag in spec +- add config file to crontab - delay of cron.{daily,...} could be + switch off +- Resolves: rhbz#253536 + * Tue Feb 27 2007 Marcela Maslanova 1.10-14 - review again diff --git a/run-parts b/run-parts index c5ca219..e4dd57e 100755 --- a/run-parts +++ b/run-parts @@ -1,4 +1,8 @@ #!/bin/bash +# if cron.daily was run today +AUX1=`cat /var/spool/anacron/cron.daily` +AUX2=`date +%Y%m%d` +[ $AUX1 == $AUX2 ] || exit 0 # run-parts - concept taken from Debian diff --git a/sources b/sources index fd0ff24..5f3cb0c 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 388110fb6a3790595b220b1585117a0e 000-delay.cron +17a8977f8b8d1d312782c67cecee34f2 config