Change in run-parts and spec.

This commit is contained in:
Marcela Mašláňová 2007-01-24 14:25:28 +00:00
parent cbff197289
commit 734f58c079
2 changed files with 10 additions and 3 deletions

View File

@ -1,7 +1,7 @@
Summary: Root crontab files used to schedule the execution of programs. Summary: Root crontab files used to schedule the execution of programs.
Name: crontabs Name: crontabs
Version: 1.10 Version: 1.10
Release: 9%{?dist} Release: 10%{?dist}
License: Public Domain License: Public Domain
Group: System Environment/Base Group: System Environment/Base
Source0: crontab 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 -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/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 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 %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -41,8 +41,14 @@ rm -rf $RPM_BUILD_ROOT
%dir /etc/cron.daily %dir /etc/cron.daily
%dir /etc/cron.weekly %dir /etc/cron.weekly
%dir /etc/cron.monthly %dir /etc/cron.monthly
%dir /etc/cron.daily/000-delay.cron
#%dir /etc/cron.weekly/000-delay.cron
%changelog %changelog
* Wed Jan 24 2007 Marcela Maslanova <mmaslano@redhat.com> 1.10-10
- crontabs should ignore Cfengine files
- Resolves: rhbz#223472
* Wed Oct 11 2006 Marcela Maslanova <mmaslano@redhat.com> 1.10-9 * Wed Oct 11 2006 Marcela Maslanova <mmaslano@redhat.com> 1.10-9
- patch (#110894) for delaying more emails in the moment - patch (#110894) for delaying more emails in the moment

View File

@ -18,7 +18,8 @@ fi
# Ignore *~ and *, scripts # Ignore *~ and *, scripts
for i in $1/*[^~,] ; do for i in $1/*[^~,] ; do
[ -d $i ] && continue [ -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%.rpmsave}" != "${i}" ] && continue
[ "${i%.rpmorig}" != "${i}" ] && continue [ "${i%.rpmorig}" != "${i}" ] && continue
[ "${i%.rpmnew}" != "${i}" ] && continue [ "${i%.rpmnew}" != "${i}" ] && continue