rpms/crontabs/devel .cvsignore, 1.2, 1.3 crontabs.spec, 1.17, 1.18 run-parts, 1.3, 1.4 sources, 1.2, 1.3

Marcela Mašláňová (mmaslano) fedora-extras-commits at redhat.com
Wed Aug 22 09:25:38 UTC 2007


Author: mmaslano

Update of /cvs/pkgs/rpms/crontabs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7043

Modified Files:
	.cvsignore crontabs.spec run-parts sources 
Log Message:
Feature: configuration file, which can deny delay between of start of @ jobs.
Correct license tag.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Oct 2006 15:28:33 -0000	1.2
+++ .cvsignore	22 Aug 2007 09:25:05 -0000	1.3
@@ -1 +1,2 @@
 000-delay.cron
+config


Index: crontabs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/devel/crontabs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- crontabs.spec	27 Feb 2007 13:31:29 -0000	1.17
+++ crontabs.spec	22 Aug 2007 09:25:05 -0000	1.18
@@ -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 @@
 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 @@
 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,15 @@
 %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
+* Tue Aug 21 2007 Marcela Maslanova <mmaslano at redhat.com> 1.10-15
+- corrected license tag in spec
+- add config file to crontab - delay of cron.{daily,...} could be
+    switch off
+- Resolves: rhbz#253536
+
 * Tue Feb 27 2007 Marcela Maslanova <mmaslano at redhat.com> 1.10-14
 - review again
 


Index: run-parts
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/devel/run-parts,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- run-parts	24 Jan 2007 14:25:28 -0000	1.3
+++ run-parts	22 Aug 2007 09:25:05 -0000	1.4
@@ -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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Oct 2006 15:28:33 -0000	1.2
+++ sources	22 Aug 2007 09:25:05 -0000	1.3
@@ -1 +1,2 @@
 388110fb6a3790595b220b1585117a0e  000-delay.cron
+17a8977f8b8d1d312782c67cecee34f2  config




More information about the fedora-extras-commits mailing list