rpms/anacron/devel anacron-2.3-hourly.patch, 1.1, 1.2 anacron.spec, 1.48, 1.49 anacron-2.3-log.patch, 1.1, NONE

[Marcela Mašláňová (mmaslano)]

Author: mmaslano

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

Modified Files:
	anacron-2.3-hourly.patch anacron.spec 
Removed Files:
	anacron-2.3-log.patch 
Log Message:
- cleaning lots of scripts in anacron & crontabs


anacron-2.3-hourly.patch:

Index: anacron-2.3-hourly.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron-2.3-hourly.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anacron-2.3-hourly.patch	28 May 2008 14:06:40 -0000	1.1
+++ anacron-2.3-hourly.patch	30 May 2008 12:45:31 -0000	1.2
@@ -1,16 +1,14 @@
-diff -up anacron-2.3/fedora/~anacron.old anacron-2.3/fedora/~anacron
---- anacron-2.3/fedora/~anacron.old	2008-05-28 13:06:21.000000000 +0200
-+++ anacron-2.3/fedora/~anacron	2008-05-22 14:40:49.000000000 +0200
-@@ -0,0 +1,36 @@
+diff -up anacron-2.3/fedora/anacron.daily.old anacron-2.3/fedora/anacron.daily
+--- anacron-2.3/fedora/anacron.daily.old	2008-05-30 14:02:27.000000000 +0200
++++ anacron-2.3/fedora/anacron.daily	2008-05-30 13:59:13.000000000 +0200
+@@ -0,0 +1,33 @@
 +#!/bin/bash
-+# cron.daily scripts aren't running, when hibernate is used. So let's solve it here.
-+
 +# wait for 3:02 when /etc/crontab runs cron.daily
 +if [ `date +%H` -le 4 ]; then
 +    exit 0;
 +fi
 +
-+#delay
++#delay - more computers on one line don't receive updates at the same time
 +[ -f /etc/sysconfig/crontab ] && . /etc/sysconfig/crontab
 +if [ ! -z "$DELAY" ]; then
 +    if [ "$DELAY" != "0" ]; then
@@ -37,4 +35,3 @@
 +	fi
 +fi
 +/usr/sbin/anacron -s
-+


Index: anacron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- anacron.spec	28 May 2008 14:06:40 -0000	1.48
+++ anacron.spec	30 May 2008 12:45:31 -0000	1.49
@@ -15,7 +15,6 @@
 Patch4: anacron-2.3-memleaking.patch
 Patch5: anacron-2.3-spooldir.patch
 Patch6: anacron-2.3-hourly.patch
-Patch7: anacron-2.3-log.patch
 
 Requires: crontabs
 Requires: initscripts
@@ -49,7 +48,6 @@
 %patch4 -p1 -b .memleaking
 %patch5 -p1 -b .spool
 %patch6 -p1
-%patch7 -p1 -b .log
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -68,7 +66,9 @@
 mkdir -p $RPM_BUILD_ROOT/etc/$i/
 done
 
-cp fedora/~anacron $RPM_BUILD_ROOT/etc/cron.hourly/~anacron
+install -m755 fedora/anacron.daily $RPM_BUILD_ROOT/etc/cron.daily/0anacron
+ln -s ../cron.daily/0anacron $RPM_BUILD_ROOT/etc/cron.weekly/0anacron
+ln -s ../cron.daily/0anacron $RPM_BUILD_ROOT/etc/cron.monthly/0anacron
 
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d/
 install -c -m755 %SOURCE2 $RPM_BUILD_ROOT/etc/rc.d/init.d/anacron
@@ -102,13 +102,17 @@
 /%{_mandir}/man5/*
 /%{_mandir}/man8/*
 /usr/sbin/anacron
-%attr(755,root,root) %dir /etc/cron.hourly/~anacron
+%dir /etc/cron.hourly
+%dir /etc/cron.daily
+%dir /etc/cron.weekly
+%dir /etc/cron.monthly
+%dir /etc/cron.daily/0anacron
+%dir /etc/cron.weekly/0anacron
+%dir /etc/cron.monthly/0anacron
 
 %changelog
 * Wed May 28 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-61
-- cleaning lots of scripts in anacron & crontabs should lead to
-    functional cron jobs (even with often shut down, hibernation)
-- change log output (too many starting anacron messages)
+- cleaning lots of scripts in anacron & crontabs 
 
 * Wed Apr  9 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-60
 - correct spooldir logged


--- anacron-2.3-log.patch DELETED ---