Attachment 262981 Details for Bug 226529 – fix the with_ conditions

[patch] fix the with_ conditions

cron-bcond2.diff (text/plain), 1.96 KB, created by Patrice Dumas on 2007-11-18 16:27:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2007-11-18 16:27:51 UTC

Size: 1.96 KB

patch

obsolete

>? .build-4.2-3.fc8.log
>? .build-4.3-2.fc9.log
>? build-4.3-2.fc9.log
>? i386
>? vixie-cron-4.2
>? vixie-cron-4.2-3.fc8.src.rpm
>? vixie-cron-4.2.tar.gz
>? vixie-cron-4.3
>? vixie-cron-4.3-2.fc9.src.rpm
>? vixie-cron.out
>Index: vixie-cron.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/vixie-cron/devel/vixie-cron.spec,v
>retrieving revision 1.108
>diff -u -3 -p -r1.108 vixie-cron.spec
>--- vixie-cron.spec	30 Oct 2007 09:37:46 -0000	1.108
>+++ vixie-cron.spec	18 Nov 2007 16:20:34 -0000
>@@ -16,15 +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}
>+%if %{with audit}
> Buildrequires: audit-libs-devel >= 1.4.1
> %endif
> 
>@@ -54,13 +54,13 @@ CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
> LDFLAGS="$LDFLAGS -fpie"; export LDFLAGS
> 
> %configure \
>-%if %{with_pam}
>+%if %{with pam}
> --with-pam \
> %endif
>-%if %{with_selinux}
>+%if %{with selinux}
> --with-selinux \
> %endif
>-%if %{with_audit}
>+%if %{with audit}
> --with-audit
> %endif
> 
>@@ -80,7 +80,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
>@@ -117,7 +117,7 @@ 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

Actions: View | Diff

Attachments on bug 226529: 240701 | 262981