diff --git a/crontabs.spec b/crontabs.spec index e489040..6af8608 100644 --- a/crontabs.spec +++ b/crontabs.spec @@ -1,7 +1,7 @@ Summary: Root crontab files used to schedule the execution of programs. Name: crontabs Version: 1.10 -Release: 9%{?dist} +Release: 10%{?dist} License: Public Domain Group: System Environment/Base Source0: crontab @@ -28,7 +28,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/bin 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 -ln $RPM_BUILD_ROOT/etc/cron.weekly/000-delay.cron $RPM_BUILD_ROOT/etc/cron.daily/000-delay.cron +#ln -s $RPM_BUILD_ROOT/etc/cron.weekly/000-delay.cron $RPM_BUILD_ROOT/etc/cron.daily/000-delay.cron %clean rm -rf $RPM_BUILD_ROOT @@ -41,8 +41,14 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/cron.daily %dir /etc/cron.weekly %dir /etc/cron.monthly +%dir /etc/cron.daily/000-delay.cron +#%dir /etc/cron.weekly/000-delay.cron %changelog +* Wed Jan 24 2007 Marcela Maslanova 1.10-10 +- crontabs should ignore Cfengine files +- Resolves: rhbz#223472 + * Wed Oct 11 2006 Marcela Maslanova 1.10-9 - patch (#110894) for delaying more emails in the moment diff --git a/run-parts b/run-parts index 4118e80..c5ca219 100755 --- a/run-parts +++ b/run-parts @@ -18,7 +18,8 @@ fi # Ignore *~ and *, scripts for i in $1/*[^~,] ; do [ -d $i ] && continue - # Don't run *.{rpmsave,rpmorig,rpmnew,swp} scripts + # Don't run *.{rpmsave,rpmorig,rpmnew,swp,cfsaved} scripts + [ "${i%.cfsaved}" != "${i}" ] && continue [ "${i%.rpmsave}" != "${i}" ] && continue [ "${i%.rpmorig}" != "${i}" ] && continue [ "${i%.rpmnew}" != "${i}" ] && continue