From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 8 Mar 2012 15:46:01 +0000 (+0000)
Subject: - skip systemd/upstart for ac
X-Git-Tag: auto/ac/cronie-1_4_8-16
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcronie.git;a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fac%2Fcronie-1_4_8-16

- skip systemd/upstart for ac

Changed files:
    cronie.spec -> 1.61
---

diff --git a/cronie.spec b/cronie.spec
index 4c485e0..a06a77c 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -7,11 +7,13 @@
 # Conditional build:
 %bcond_without	inotify		# without inotify support
 %if "%{pld_release}" == "ac"
-%bcond_with		selinux		# without SELinux support
-%bcond_with		audit		# without audit support
+%bcond_with		selinux		# with SELinux support
+%bcond_with		audit		# with audit support
+%bcond_with		systemd		# with systemd units
 %else
 %bcond_without	selinux		# without SELinux support
 %bcond_without	audit		# without audit support
+%bcond_with		systemd		# without systemd units
 %endif
 
 Summary:	Cron daemon for executing programs at set times
@@ -49,7 +51,7 @@ Requires(pre):	/usr/sbin/groupadd
 Requires:	/bin/run-parts
 Requires:	psmisc >= 20.1
 Requires:	rc-scripts >= 0.4.3.0
-Requires:	systemd-units >= 37-0.10
+%{?with_systemd:Requires:	systemd-units >= 37-0.10}
 %{?with_inotify:Requires:	uname(release) >= 2.6.13}
 Provides:	crondaemon
 Provides:	crontabs = 1.7
@@ -225,7 +227,7 @@ chmod 754 /etc/rc.d/init.d/crond
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/crond
 %attr(754,root,root) /etc/rc.d/init.d/crond
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/cron
-%{systemdunitdir}/crond.service
+%{?with_systemd:%{systemdunitdir}/crond.service}
 %attr(755,root,root) %{_sbindir}/crond
 %attr(2755,root,crontab) %{_bindir}/crontab
 
@@ -246,7 +248,7 @@ chmod 754 /etc/rc.d/init.d/crond
 
 %attr(1730,root,crontab) /var/spool/anacron
 
-%if "%{pld_release}" != "ti"
+%if "%{pld_release}" == "th"
 %files upstart
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/init/crond.conf