From 9c60ee1100e5c0954e6d66dc4afd4e9399f5533c Mon Sep 17 00:00:00 2001
From: Marcela Mašláňová <mmaslano@fedoraproject.org>
Date: Nov 03 2009 13:50:35 +0000
Subject: - 531963 and 532482 creating noanacron package


---

diff --git a/.cvsignore b/.cvsignore
index a52f182..48319eb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cronie-1.4.2.tar.gz
+cronie-1.4.3.tar.gz
diff --git a/contrib.patch b/contrib.patch
deleted file mode 100644
index 55e69c4..0000000
--- a/contrib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN cronie-1.4.2/contrib.old/0anacron cronie-1.4.2/contrib/0anacron
---- cronie-1.4.2/contrib.old/0anacron	2009-09-25 08:23:18.000000000 +0200
-+++ cronie-1.4.2/contrib/0anacron	2009-10-30 17:34:28.369959197 +0100
-@@ -1,4 +1,9 @@
- #!/bin/bash
-+# in case nonanacron is installed
-+if [! -x /etc/cron.daily/dailyjob ]; then
-+    exit 0;
-+fi
-+
- #in case file doesn't exist 
- if test -x /var/spool/anacron/cron.daily; then
-     day=`cat /var/spool/anacron/cron.daily`
diff --git a/cronie-service-stop.patch b/cronie-service-stop.patch
deleted file mode 100644
index fe91673..0000000
--- a/cronie-service-stop.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1a732d69938788dde2f1a8bf3ae1b9dc48d10c99 Mon Sep 17 00:00:00 2001
-From: HONDA Hirofumi <honda.hirofumi@oss.ntt.co.jp>
-Date: Mon, 19 Oct 2009 12:25:15 +0200
-Subject: [PATCH] When parent crond is stopped and child crond (executing program) is running,"service crond status" reports "crond (pid  XXX) is running...".
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Marcela Mašláňová <mmaslano@redhat.com>
----
- cronie.init |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/cronie.init b/cronie.init
-index 0d98159..446607e 100755
---- a/cronie.init
-+++ b/cronie.init
-@@ -88,7 +88,7 @@ force_reload() {
- 
- rh_status() {
-     # run checks to determine if the service is running or use generic status
--    status $prog
-+    status -p /var/run/crond.pid $prog
- }
- 
- rh_status_q() {
--- 
-1.6.5.rc2
-
diff --git a/cronie.spec b/cronie.spec
index 2e97806..3e72c7f 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -5,14 +5,12 @@
 
 Summary: Cron daemon for executing programs at set times
 Name: cronie
-Version: 1.4.2
-Release: 3%{?dist}
+Version: 1.4.3
+Release: 1%{?dist}
 License: MIT and BSD and GPLv2
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
 Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
-Patch0:	cronie-service-stop.patch
-Patch1: contrib.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: syslog, bash >= 2.0
@@ -71,8 +69,6 @@ Old style of {hourly,daily,weekly,monthly}.jobs without anacron. No features.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 
@@ -116,7 +112,7 @@ touch $RPM_BUILD_ROOT/var/spool/anacron/cron.weekly
 touch $RPM_BUILD_ROOT/var/spool/anacron/cron.monthly
 
 # noanacron package
-install -m 644 $RPM_SOURCE_DIR/dailyjobs $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/dailyjobs
+install -m 644 contrib/dailyjobs $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/dailyjobs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -176,13 +172,13 @@ cp -a /var/lock/subsys/crond /var/lock/subsys/cronie > /dev/null 2>&1 ||:
 %endif
 %config(noreplace) %{_sysconfdir}/sysconfig/crond
 %config(noreplace) %{_sysconfdir}/cron.deny
-%config(noreplace) %{_sysconfdir}/anacrontab
 %attr(0644,root,root) %{_sysconfdir}/cron.d/0hourly
 
 %files anacron
 %defattr(-,root,root,-)
 %{_sbindir}/anacron
 %attr(0755,root,root) %{_sysconfdir}/cron.hourly/0anacron
+%config(noreplace) %{_sysconfdir}/anacrontab
 %dir /var/spool/anacron
 %ghost %verify(not md5 size mtime) /var/spool/anacron/cron.daily
 %ghost %verify(not md5 size mtime) /var/spool/anacron/cron.weekly
@@ -195,8 +191,8 @@ cp -a /var/lock/subsys/crond /var/lock/subsys/cronie > /dev/null 2>&1 ||:
 %attr(0644,root,root) %{_sysconfdir}/cron.d/dailyjobs
 
 %changelog
-* Fri Oct 30 2009 Marcela Mašláňová <mmaslano@redhat.com> - 1.4.2-3
-- 531963 creating noanacron package
+* Fri Oct 30 2009 Marcela Mašláňová <mmaslano@redhat.com> - 1.4.3-1
+- 531963 and 532482 creating noanacron package
 
 * Mon Oct 19 2009 Marcela Mašláňová <mmaslano@redhat.com> - 1.4.2-2
 - 529632 service crond stop returns appropriate value
diff --git a/dailyjobs b/dailyjobs
deleted file mode 100644
index b60ab2d..0000000
--- a/dailyjobs
+++ /dev/null
@@ -1,10 +0,0 @@
-SHELL=/bin/bash
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-MAILTO=root
-HOME=/
-
-# run-parts
-01 * * * * root [! -f /etc/cron.daily/0anacron] && run-parts /etc/cron.hourly
-02 4 * * * root [! -f /etc/cron.daily/0anacron] && run-parts /etc/cron.daily
-22 4 * * 0 root [! -f /etc/cron.daily/0anacron] && run-parts /etc/cron.weekly
-42 4 1 * * root [! -f /etc/cron.daily/0anacron] && run-parts /etc/cron.monthly
diff --git a/sources b/sources
index 5169d2b..76d8ffb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c7cef09ff9c92a90a314a1e947fae5c  cronie-1.4.2.tar.gz
+7d9a9949ed562dd2c94330b51e2344e0  cronie-1.4.3.tar.gz