From 8cc1113825a986c59dd48cd032e75eeb0d36cc2d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:43:08 +0000 Subject: [PATCH 1/7] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From f5f60a73e0c6b6073521044cc66f16ef5d5d6cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20ONDREJ?= Date: Mon, 1 Dec 2008 07:28:57 +0000 Subject: [PATCH 2/7] Added /etc/cron.{hourly,daily,weekly,monthly} dirs again. bz#473353 --- crontabs.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/crontabs.spec b/crontabs.spec index 9934907..5036156 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: 23%{?dist} +Release: 24%{?dist} License: Public Domain and GPLv2 Group: System Environment/Base Source0: crontab @@ -36,8 +36,15 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/crontab %{_bindir}/run-parts %config(noreplace) /etc/sysconfig/crontab +%dir /etc/cron.hourly +%dir /etc/cron.daily +%dir /etc/cron.weekly +%dir /etc/cron.monthly %changelog +* Mon Dec 1 2008 Jan ONDREJ (SAL) 1.10-24 +- Added /etc/cron.{hourly,daily,weekly,monthly} dirs again. bz#473353 + * Mon Jun 9 2008 Marcela Maslanova 1.10-23 - 450084 LANG=C is set up for running scripts From dbe8774127248b8e2a6be7ec5b54099c3e5f296d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20ONDREJ?= Date: Mon, 1 Dec 2008 07:34:38 +0000 Subject: [PATCH 3/7] Added /etc/cron.{hourly,daily,weekly,monthly} dirs again. bz#473353 --- crontabs.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/crontabs.spec b/crontabs.spec index 5036156..d0e02e3 100644 --- a/crontabs.spec +++ b/crontabs.spec @@ -22,6 +22,7 @@ your system. %install 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 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/crontab From 25ed37e5d6a24bc84737bb55620c0bc88634d9d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20ONDREJ?= Date: Mon, 1 Dec 2008 07:37:15 +0000 Subject: [PATCH 4/7] Increased release to be able to tag again. --- crontabs.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crontabs.spec b/crontabs.spec index d0e02e3..54d00f7 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: 24%{?dist} +Release: 25%{?dist} License: Public Domain and GPLv2 Group: System Environment/Base Source0: crontab @@ -43,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/cron.monthly %changelog -* Mon Dec 1 2008 Jan ONDREJ (SAL) 1.10-24 +* Mon Dec 1 2008 Jan ONDREJ (SAL) 1.10-25 - Added /etc/cron.{hourly,daily,weekly,monthly} dirs again. bz#473353 * Mon Jun 9 2008 Marcela Maslanova 1.10-23 From b2078df0394587dc51a35d811ca8d9f9975cea09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 28 Jan 2009 13:15:42 +0000 Subject: [PATCH 5/7] - 477709 hack around jobs running twice - switch off random delay for anacron jobs as default in sysconfig --- .cvsignore | 3 +++ crontabs.spec | 18 +++++++++++++++--- sources | 3 +++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 04204c7..b670c5e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,4 @@ config +crontab +run-parts +000-delay.cron diff --git a/crontabs.spec b/crontabs.spec index 54d00f7..d56f473 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: 25%{?dist} +Release: 26%{?dist} License: Public Domain and GPLv2 Group: System Environment/Base Source0: crontab Source1: run-parts -Source2: config +Source2: 000-delay.cron +Source3: config BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -25,9 +26,12 @@ 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 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/crontab +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 +ln -s ../cron.daily/000-delay.cron $RPM_BUILD_ROOT/etc/cron.weekly/000-delay.cron +ln -s ../cron.daily/000-delay.cron $RPM_BUILD_ROOT/etc/cron.monthly/000-delay.cron %clean rm -rf $RPM_BUILD_ROOT @@ -41,8 +45,16 @@ 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 +%dir /etc/cron.monthly/000-delay.cron +%config(noreplace) /etc/sysconfig/crontab %changelog +* Thu Jan 28 2009 Marcela Maslanova 1.10-26 +- 477709 hack around jobs running twice +- switch off random delay for anacron jobs as default in sysconfig + * Mon Dec 1 2008 Jan ONDREJ (SAL) 1.10-25 - Added /etc/cron.{hourly,daily,weekly,monthly} dirs again. bz#473353 diff --git a/sources b/sources index ba72251..c71d3b0 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ ba1e7d606a110d281c16d9d49c6f335d config +03fa15e550843194a8ba55b473a6549a crontab +9b3ddd391150661ba50667a2a32cbda6 run-parts +159145e4bdd9f0fc6efaf040cba3480c 000-delay.cron From 3edd1db57c9aa01df33ca15f7b11a5c9d5bf388e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:19 +0000 Subject: [PATCH 6/7] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 10e4626..ae96448 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: crontabs -# $Id: Makefile,v 1.1 2004/09/09 03:58:16 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:40:33 notting Exp $ NAME := crontabs SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 2d745bae8a2707db913cc93649f05c1b2d4f9dd3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 12:19:36 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 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 ae96448..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: crontabs -# $Id: Makefile,v 1.2 2007/10/15 18:40:33 notting Exp $ -NAME := crontabs -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10