From fd27bc0cfdaf222f5be0b73dd46a0e8d79f65741d172770c6ffc80a1c94b7785 Mon Sep 17 00:00:00 2001
From: Kristyna Streitova <kstreitova@suse.com>
Date: Tue, 20 Aug 2019 08:34:31 +0000
Subject: [PATCH] Accepting request 724634 from home:kukuk:cron

Move /etc/cron.* directories to cron package

OBS-URL: https://build.opensuse.org/request/show/724634
OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=177
---
 cronie.changes |  7 +++++++
 cronie.spec    | 30 ++++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/cronie.changes b/cronie.changes
index 4e4fbb0..fbb63f9 100644
--- a/cronie.changes
+++ b/cronie.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 19 19:01:01 UTC 2019 - Thorsten Kukuk <kukuk@suse.com>
+
+- Add /etc/cron.* directories to cron sub-package from filesystem
+  - allows correct usage of permissions macros
+  - fixes installation of this directories on systems without cron
+
 -------------------------------------------------------------------
 Thu May 16 10:16:10 UTC 2019 - Kristýna Streitová <kstreitova@suse.com>
 
diff --git a/cronie.spec b/cronie.spec
index 91575c8..e4eb6a5 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -89,6 +89,7 @@ Release:        0
 Summary:        Auxiliary package
 Group:          System/Daemons
 Requires:       %{name} = %{cronie_version}-%{release}
+Requires(post): permissions
 
 %description -n cron
 Auxiliary package, needed for proper update from vixie-cron 4.1 to cronie 1.4.4
@@ -104,7 +105,7 @@ The default settings execute regular jobs by anacron, however this could be
 overloaded in settings.
 
 %prep
-%setup -q -n %{name}-%{name}-%{cronie_version} 
+%setup -q -n %{name}-%{name}-%{cronie_version}
 %patch3 -p1
 %patch4
 %patch5 -p1
@@ -148,6 +149,12 @@ mv %{buildroot}%{_sbindir}/crond %{buildroot}%{_sbindir}/cron
 mkdir -p %{buildroot}%{_fillupdir}
 cp %{SOURCE9} %{buildroot}%{_fillupdir}/
 
+mkdir -p %{buildroot}%{_sysconfdir}/cron.d
+mkdir -p %{buildroot}%{_sysconfdir}/cron.hourly
+mkdir -p %{buildroot}%{_sysconfdir}/cron.daily
+mkdir -p %{buildroot}%{_sysconfdir}/cron.weekly
+mkdir -p %{buildroot}%{_sysconfdir}/cron.monthly
+
 touch %{buildroot}%{_localstatedir}/spool/anacron/cron.daily
 touch %{buildroot}%{_localstatedir}/spool/anacron/cron.weekly
 touch %{buildroot}%{_localstatedir}/spool/anacron/cron.monthly
@@ -194,6 +201,20 @@ exit 0
 [ -e %{_localstatedir}/spool/anacron/cron.weekly ] || touch %{_localstatedir}/spool/anacron/cron.weekly
 [ -e %{_localstatedir}/spool/anacron/cron.monthly ] || touch %{_localstatedir}/spool/anacron/cron.monthly
 
+%verifyscript -n cron
+%verify_permissions -e /etc/cron.d
+%verify_permissions -e /etc/cron.daily
+%verify_permissions -e /etc/cron.hourly
+%verify_permissions -e /etc/cron.monthly
+%verify_permissions -e /etc/cron.weekly
+
+%post -n cron
+%set_permissions /etc/cron.d
+%set_permissions /etc/cron.daily
+%set_permissions /etc/cron.hourly
+%set_permissions /etc/cron.monthly
+%set_permissions /etc/cron.weekly
+
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING README ChangeLog
@@ -231,5 +252,10 @@ exit 0
 %files -n cron
 %defattr(-,root,root,-)
 %doc cron_to_cronie.README
+%dir %attr(755,root,root) %{_sysconfdir}/cron.d
+%dir %attr(755,root,root) %{_sysconfdir}/cron.hourly
+%dir %attr(755,root,root) %{_sysconfdir}/cron.daily
+%dir %attr(755,root,root) %{_sysconfdir}/cron.weekly
+%dir %attr(755,root,root) %{_sysconfdir}/cron.monthly
 
 %changelog