From d0fb69e1859a06e46de51b26770568777dcaeb85 Mon Sep 17 00:00:00 2001
From: Marcela Maslanova <marca@dhcp-lab-135.englab.brq.redhat.com>
Date: Mon, 29 Oct 2007 16:18:46 +0100
Subject: [PATCH] Update spec file - new bcond macro.

---
 vixie-cron.spec | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/vixie-cron.spec b/vixie-cron.spec
index 3623671..ef5bfd3 100644
--- a/vixie-cron.spec
+++ b/vixie-cron.spec
@@ -1,16 +1,10 @@
-%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%define WITH_SELINUX 1
-%endif
-%if %{?WITH_PAM:0}%{!?WITH_PAM:1}
-%define WITH_PAM 1
-%endif
-%if %{?WITH_AUDIT:0}%{!?WITH_AUDIT:1}
-%define WITH_AUDIT 1
-%endif
+%bcond_without selinux
+%bcond_without pam
+%bcond_without audit
 Summary: The Vixie cron daemon for executing specified programs at set times
 Name: vixie-cron
 Version: 4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 4
 License: MIT and BSD
 Group: System Environment/Base
@@ -22,17 +16,15 @@ Requires: syslog, bash >= 2.0
 Buildrequires: automake, autoconf
 Conflicts: sysklogd < 1.4.1
 
-%if %{WITH_SELINUX}
+%if %{with_selinux}
 Requires: libselinux >= 2.0.0
 Buildrequires: libselinux-devel >= 2.0.0
 %endif
-%if %{WITH_PAM}
+%if %{with_pam}
 Requires: pam >= 0.99.6.2
 Buildrequires: pam-devel >= 0.99.6.2
 %endif
-%if %{WITH_AUDIT}
-Requires: audit-libs >= 1.4.1
-Buildrequires: audit-libs >= 1.4.1
+%if %{with_audit}
 Buildrequires: audit-libs-devel >= 1.4.1
 %endif
 
@@ -62,13 +54,13 @@ CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
 LDFLAGS="$LDFLAGS -fpie"; export LDFLAGS
 
 %configure \
-%if %{WITH_SELINUX}
---with-selinux \
-%endif
-%if %{WITH_PAM}
+%if %{with_pam}
 --with-pam \
 %endif
-%if %{WITH_AUDIT}
+%if %{with_selinux}
+--with-selinux \
+%endif
+%if %{with_audit}
 --with-audit
 %endif
 
@@ -88,8 +80,8 @@ mv $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/crond.pam $RPM_BUILD_ROOT/%{_sysconfdir}
 mv ./vixie-cron.init $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/crond
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/
 mv ./crond.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/crond
-%if ! %{WITH_PAM}
-    rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d}
+%if ! %{with_pam}
+    rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
 %endif
 touch $RPM_BUILD_ROOT/%{_sysconfdir}/cron.deny
 
@@ -125,13 +117,17 @@ fi
 %attr(755,root,root) %dir %{_localstatedir}/spool/cron
 %attr(755,root,root) %dir %{_sysconfdir}/cron.d
 %attr(755,root,root) %{_sysconfdir}/rc.d/init.d/crond
-%if %{WITH_PAM}
+%if %{with_pam}
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/crond
 %endif
 %config(noreplace) %{_sysconfdir}/sysconfig/crond
 %config(noreplace) %{_sysconfdir}/cron.deny
 
 %changelog
+* Mon Oct 29 2007 Marcela Maslanova <mmaslano@redhat.com> - 4:4.2-4
+- 247228: cron jobs fail semi-randomly if sendmail incapacitated
+- 226529: Merge Review: vixie-cron (use bcond macros)
+
 * Mon Sep 24 2007 Marcela Maslanova <mmaslano@redhat.com> - 4:4.2-3
 - cron own cron.deny
 - correct license tag
-- 
2.40.0