packages: cronie/cronie.spec - skip systemd/upstart for ac

[glen]

Author: glen                         Date: Thu Mar  8 15:46:06 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- skip systemd/upstart for ac

---- Files affected:
packages/cronie:
   cronie.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: packages/cronie/cronie.spec
diff -u packages/cronie/cronie.spec:1.60 packages/cronie/cronie.spec:1.61
--- packages/cronie/cronie.spec:1.60	Thu Mar  8 16:43:19 2012
+++ packages/cronie/cronie.spec	Thu Mar  8 16:46:01 2012
@@ -8,11 +8,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
@@ -50,7 +52,7 @@
 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
@@ -226,7 +228,7 @@
 %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
 
@@ -247,7 +249,7 @@
 
 %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
@@ -259,6 +261,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2012/03/08 15:46:01  glen
+- skip systemd/upstart for ac
+
 Revision 1.60  2012/03/08 15:43:19  glen
 - -fPIE in gcc 3.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cronie/cronie.spec?r1=1.60&r2=1.61&f=u