Author: glen Date: Tue Mar 13 16:22:12 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- use rpmbuild(macros) that disables systemd stuff for ac
---- Files affected:
packages/cronie:
cronie.spec (1.62 -> 1.63)
---- Diffs:
================================================================
Index: packages/cronie/cronie.spec
diff -u packages/cronie/cronie.spec:1.62 packages/cronie/cronie.spec:1.63
--- packages/cronie/cronie.spec:1.62 Mon Mar 12 11:28:41 2012
+++ packages/cronie/cronie.spec Tue Mar 13 17:22:07 2012
@@ -10,24 +10,15 @@
%if "%{pld_release}" == "ac"
%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
-
-%if %{without systemd}
-%define systemd_post() %{nil}
-%define systemd_preun() %{nil}
-%define systemd_reload() %{nil}
-%define systemd_trigger() %{nil}
%endif
Summary: Cron daemon for executing programs at set times
Name: cronie
Version: 1.4.8
-Release: 17
+Release: 18
License: MIT and BSD and GPL v2
Group: Daemons
Source0:
https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
@@ -50,7 +41,7 @@
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: pam-devel
BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.626
+BuildRequires: rpmbuild(macros) >= 1.647
Requires(post): fileutils
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
@@ -59,7 +50,9 @@
Requires: /bin/run-parts
Requires: psmisc >= 20.1
Requires: rc-scripts >= 0.4.3.0
-%{?with_systemd:Requires: systemd-units >= 37-0.10}
+%if %{pld_release} != "ac"
+Requires: systemd-units >= 37-0.10}
+%endif
%{?with_inotify:Requires: uname(release) >= 2.6.13}
Provides: crondaemon
Provides: crontabs = 1.7
@@ -235,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
-%{?with_systemd:%{systemdunitdir}/crond.service}
+%{systemdunitdir}/crond.service
%attr(755,root,root) %{_sbindir}/crond
%attr(2755,root,crontab) %{_bindir}/crontab
@@ -268,6 +261,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.63 2012/03/13 16:22:07 glen
+- use rpmbuild(macros) that disables systemd stuff for ac
+
Revision 1.62 2012/03/12 10:28:41 glen
- clear systemd macros when systemd is off
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cronie/cronie.spec?r1=1.62&r2=1.63&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
