Attachment 240701 Details for Bug 226529 – add without_bcond like macros

[patch] add without_bcond like macros

cron-bcond.diff (text/plain), 2.30 KB, created by Patrice Dumas on 2007-10-27 20:13:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2007-10-27 20:13:43 UTC

Size: 2.30 KB

patch

obsolete

>Index: vixie-cron.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/vixie-cron/devel/vixie-cron.spec,v
>retrieving revision 1.106
>diff -u -3 -p -r1.106 vixie-cron.spec
>--- vixie-cron.spec	24 Sep 2007 13:38:58 -0000	1.106
>+++ vixie-cron.spec	27 Oct 2007 18:41:58 -0000
>@@ -1,12 +1,7 @@
>-%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
>@@ -19,15 +14,15 @@ Buildroot: %{_tmppath}/%{name}-%{version
> 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}
>+%if %{with audit}
> Requires: audit-libs >= 1.4.1
> Buildrequires: audit-libs >= 1.4.1
> Buildrequires: audit-libs-devel >= 1.4.1
>@@ -56,18 +51,18 @@ autoconf
> 
> %build
> %configure \
>-%if %{WITH_PAM}
>+%if %{with pam}
> --with-pam
> %endif
> 
> make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DLINT -Dlint" \
>-%if %{WITH_SELINUX}
>+%if %{with selinux}
> WITH_SELINUX=1 \
> %endif
>-%if %{WITH_PAM}
>+%if %{with pam}
> WITH_PAM=1 \
> %endif
>-%if %{WITH_AUDIT}
>+%if %{with audit}
> WITH_AUDIT=1 \
> %endif
> ;
>@@ -86,7 +81,7 @@ mv $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/
> 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}
>+%if ! %{with pam}
> 	rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
> %endif
> touch $RPM_BUILD_ROOT/%{_sysconfdir}/cron.deny
>@@ -124,7 +119,7 @@ fi
> %attr(700,root,root) %dir %{_localstatedir}/spool/cron
> %attr(700,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

Actions: View | Diff

Attachments on bug 226529: 240701 | 262981