diff --git a/.cvsignore b/.gitignore similarity index 68% rename from .cvsignore rename to .gitignore index c32f57e..0fcdc5a 100644 --- a/.cvsignore +++ b/.gitignore @@ -1 +1,2 @@ 000-delay.cron +config diff --git a/Makefile b/Makefile deleted file mode 100644 index 9299eb5..0000000 --- a/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Makefile for source rpm: crontabs -# $Id$ -NAME := crontabs -SPECFILE = $(firstword $(wildcard *.spec)) - -include ../common/Makefile.common diff --git a/crontabs.spec b/crontabs.spec index 9381610..f4fb897 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: 16%{?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,9 +37,9 @@ 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 +%{_bindir}/run-parts %dir /etc/cron.hourly %dir /etc/cron.daily %dir /etc/cron.weekly @@ -45,8 +47,16 @@ 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 +* Thu Aug 30 2007 Marcela Maslanova 1.10-16 +- fix the update, because anacron hasn't here lock cron.daily +- use better configuration + +* Mon Aug 27 2007 Marcela Maslanova 1.10-15 +- delay of running jobs is now configurable + * Tue Feb 27 2007 Marcela Maslanova 1.10-14 - review again diff --git a/run-parts b/run-parts index c5ca219..e321762 100755 --- a/run-parts +++ b/run-parts @@ -1,5 +1,4 @@ #!/bin/bash - # run-parts - concept taken from Debian # keep going when something fails diff --git a/sources b/sources index fd0ff24..2e8e658 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -388110fb6a3790595b220b1585117a0e 000-delay.cron +ba1e7d606a110d281c16d9d49c6f335d config +159145e4bdd9f0fc6efaf040cba3480c 000-delay.cron