From dcf102a1e45c8e93c1af402471d580006e18f3079b986fc004cdc90cae9c6a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?=
 <vcizek@suse.com>
Date: Wed, 30 Nov 2011 16:23:05 +0000
Subject: [PATCH] Accepting request 94560 from
 home:a_jaeger:branches:openSUSE:Factory

Merge cron requests, fix starting of cron.

OBS-URL: https://build.opensuse.org/request/show/94560
OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=92
---
 cron.service   |  2 +-
 cronie.changes | 12 ++++++++++++
 cronie.spec    |  6 +++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/cron.service b/cron.service
index cab8fa8..afb4c4e 100644
--- a/cron.service
+++ b/cron.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Command Scheduler
-After=syslog.target mail-transfer-agent.target
+After=syslog.target mail-transfer-agent.target ypbind.service nscd.service network.target
 
 [Service]
 ExecStart=/usr/sbin/cron -n
diff --git a/cronie.changes b/cronie.changes
index 440cb2a..b34639e 100644
--- a/cronie.changes
+++ b/cronie.changes
@@ -1,8 +1,20 @@
+-------------------------------------------------------------------
+Wed Nov 30 14:54:08 UTC 2011 - aj@suse.de
+
+- Add dependency on ypbind and nscd (bnc#732356)
+- Do not install generic INSTALL file.
+- Use set_permissions for newer distros.
+
 -------------------------------------------------------------------
 Wed Nov 30 09:47:40 UTC 2011 - coolo@suse.com
 
 - add automake as buildrequire to avoid implicit dependency
 
+-------------------------------------------------------------------
+Tue Nov 29 17:07:07 UTC 2011 - crrodriguez@opensuse.org
+
+- Cron started before network is up [bnc#733275] 
+
 -------------------------------------------------------------------
 Fri Oct  7 12:11:17 UTC 2011 - fcrozat@suse.com
 
diff --git a/cronie.spec b/cronie.spec
index e29d3b8..3a0ae93 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -172,7 +172,11 @@ if [ -e /var/run/update_from_old_cron ]; then
 	%__ln_s /bin/true /etc/init.d/cron
 fi
 %{fillup_and_insserv -y cron} 
+%if 0%{?suse_version} >= 1140
+%set_permissions /etc/crontab /usr/bin/crontab
+%else
 %run_permissions
+%endif
 %service_add_post cron.service
 
 %verifyscript
@@ -200,7 +204,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING INSTALL README ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %dir %attr(700,root,root) /var/spool/cron
 %dir %attr(700,root,root) /var/spool/cron/tabs
 %dir /var/spool/cron/lastrun