From bb178856439e3bae9ef21481ec4926b890833cf1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 03:26:12 +0000 Subject: [PATCH 1/4] Initialize branch F-7 for crontabs --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 93203a7d4131cd18de3ff3219d9b4d517509dc49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Mon, 27 Aug 2007 06:52:58 +0000 Subject: [PATCH 2/4] Update - config file for jobs delay. --- .cvsignore | 1 + crontabs.spec | 14 ++++++++++---- run-parts | 4 ++++ sources | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) 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..4d4c423 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,12 @@ 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 +* 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..31e336f 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 From d68e726e03e3967d295f61eeb293d743fb1ad412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Thu, 30 Aug 2007 12:41:37 +0000 Subject: [PATCH 3/4] - fix the update, because anacron hasn't here lock cron.daily - use better configuration --- crontabs.spec | 8 ++++++-- run-parts | 5 ----- sources | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/crontabs.spec b/crontabs.spec index 4d4c423..f4fb897 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: 15%{?dist} +Release: 16%{?dist} License: Public Domain and GPLv2 Group: System Environment/Base Source0: crontab @@ -39,7 +39,7 @@ rm -rf $RPM_BUILD_ROOT %files %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 @@ -50,6 +50,10 @@ rm -rf $RPM_BUILD_ROOT %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 diff --git a/run-parts b/run-parts index 31e336f..e321762 100755 --- a/run-parts +++ b/run-parts @@ -1,9 +1,4 @@ #!/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 # keep going when something fails diff --git a/sources b/sources index 5f3cb0c..2e8e658 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -388110fb6a3790595b220b1585117a0e 000-delay.cron -17a8977f8b8d1d312782c67cecee34f2 config +ba1e7d606a110d281c16d9d49c6f335d config +159145e4bdd9f0fc6efaf040cba3480c 000-delay.cron From 127aba740a9df4af7eb3aab0657fc87d8e769b5f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 12:19:30 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 6 ------ branch | 1 - 3 files changed, 7 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore 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/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7