From 8f2c4b688f608dad4c0063ea13d9bc7a4762be2a6366f7681594b7f1774206e4 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Thu, 12 Sep 2013 17:29:26 +0000
Subject: [PATCH] Accepting request 198383 from
 home:elvigia:branches:Base:System

- define PIDIDIR to "/run" instead of the (outdated) definition
  coming from glibc "paths.h"
- systemd: there is no mail-transfer-agent target anymore, services
  must be ordered After= a list of possible MTA.

OBS-URL: https://build.opensuse.org/request/show/198383
OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=119
---
 cron.service        |  3 ++-
 cronie-piddir.patch | 11 +++++++++++
 cronie.changes      |  8 ++++++++
 cronie.spec         |  2 ++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 cronie-piddir.patch

diff --git a/cron.service b/cron.service
index a4563e4..aacb697 100644
--- a/cron.service
+++ b/cron.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Command Scheduler
-After=mail-transfer-agent.target ypbind.service nscd.service network.target
+After=ypbind.service nscd.service network.target
+After=postfix.service sendmail.service exim.service
 
 [Service]
 ExecStart=/usr/sbin/cron -n
diff --git a/cronie-piddir.patch b/cronie-piddir.patch
new file mode 100644
index 0000000..7865c7e
--- /dev/null
+++ b/cronie-piddir.patch
@@ -0,0 +1,11 @@
+--- cronie-1.4.8.orig/src/pathnames.h
++++ cronie-1.4.8/src/pathnames.h
+@@ -37,7 +37,7 @@
+ 			 * (Don't ask why the default is "/etc/".)
+ 			 */
+ #ifdef _PATH_VARRUN
+-# define PIDDIR	_PATH_VARRUN
++# define PIDDIR	"/run/"
+ #else
+ # define PIDDIR SYSCONFDIR "/"
+ #endif
diff --git a/cronie.changes b/cronie.changes
index fd79aa2..295bbd0 100644
--- a/cronie.changes
+++ b/cronie.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Sep 10 21:30:58 UTC 2013 - crrodriguez@opensuse.org
+
+- define PIDIDIR to "/run" instead of the (outdated) definition 
+  coming from glibc "paths.h"
+- systemd: there is no mail-transfer-agent target anymore, services
+  must be ordered After= a list of possible MTA.
+
 -------------------------------------------------------------------
 Sun Apr 14 02:14:21 UTC 2013 - crrodriguez@opensuse.org
 
diff --git a/cronie.spec b/cronie.spec
index 6a2ed86..0bd9b46 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -60,6 +60,7 @@ Patch9:         cronie-1.4.8-bug_756197.diff
 Patch10:        cronie-nofork-nopid.patch
 # PATCH-FIX-UPSTREAM bnc#786096
 Patch11:        bug-786096_cronie-fdleak.diff
+Patch12:        cronie-piddir.patch
 Conflicts:      cron <= 4.1
 # When finish update protection of sles11 we could uncomment line bellow and drop all
 # ugly hacks with subpackage cron needed for proper update proces
@@ -106,6 +107,7 @@ overloaded in settings.
 cp %{S:7} ./cron_to_cronie.README
 %patch10
 %patch11 -p1 
+%patch12 -p1
 %build
 # fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked
 export CFLAGS="$RPM_OPT_FLAGS -DCRON_VERSION=\\\"%{version}\\\""