rpms/vixie-cron/devel vixie-cron-4.1-_52-bz181439.patch, NONE, 1.1 vixie-cron.spec, 1.66, 1.67

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25530

Modified Files:
	vixie-cron.spec 
Added Files:
	vixie-cron-4.1-_52-bz181439.patch 
Log Message:
fix bug 181439: enable easier selection of conditional compilation WITH_* features

vixie-cron-4.1-_52-bz181439.patch:
 Makefile |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

--- NEW FILE vixie-cron-4.1-_52-bz181439.patch ---
--- vixie-cron-4.1/Makefile.bz181439	2006-02-14 15:57:08.000000000 -0500
+++ vixie-cron-4.1/Makefile	2006-02-14 15:57:22.000000000 -0500
@@ -60,7 +60,19 @@
 INCLUDE		=	-I.
 #INCLUDE	=
 #<<need getopt()>>
-LIBS		= 	-lselinux -lpam -lpam_misc -laudit
+ifdef WITH_SELINUX
+SELINUX_LIBS=-lselinux
+SELINUX_DEFS=-DWITH_SELINUX
+endif
+ifdef WITH_PAM
+PAM_LIBS=-lpam -lpam_misc
+PAM_DEFS=-DWITH_PAM
+endif
+ifdef WITH_AUDIT
+AUDIT_LIBS=-laudit
+AUDIT_DEFS=-DWITH_AUDIT
+endif
+LIBS		=       $(SELINUX_LIBS) $(PAM_LIBS) $(AUDIT_LIBS)
 #<<optimize or debug?>>
 #CDEBUG		=	-O
 #CDEBUG		=	-g
@@ -70,7 +82,7 @@
 #<<want to use a nonstandard CC?>>
 CC		=	gcc -Wall -Wno-unused -Wno-comment
 #<<manifest defines>>
-DEFS		=	-DWITH_SELINUX -DWITH_PAM -DWITH_AUDIT
+DEFS		=	$(SELINUX_DEFS) $(PAM_DEFS) $(AUDIT_DEFS)
 #(SGI IRIX systems need this)
 #DEFS		=	-D_BSD_SIGNALS -Dconst=
 #<<the name of the BSD-like install program>>


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- vixie-cron.spec	14 Feb 2006 20:30:18 -0000	1.66
+++ vixie-cron.spec	14 Feb 2006 21:02:14 -0000	1.67
@@ -4,6 +4,9 @@
 %if %{?WITH_PAM:0}%{!?WITH_PAM:1}
 %define WITH_PAM 1
 %endif
+%if %{?WITH_AUDIT:0}%{!?WITH_AUDIT:1}
+%define WITH_AUDIT 1
+%endif
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
@@ -66,6 +69,7 @@
 Patch49: vixie-cron-4.1-_49-bz178436.patch
 Patch50: vixie-cron-4.1-_50-bz178931.patch
 Patch51: vixie-cron-4.1-_51-bz180145-mail_i18n.patch
+Patch52: vixie-cron-4.1-_52-bz181439.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: syslog, bash >= 2.0
 Conflicts: sysklogd < 1.4.1
@@ -77,6 +81,9 @@
 Requires: pam >= 0.77-66.8
 Buildrequires: pam-devel
 %endif
+%if %{WITH_AUDIT}
+Requires: audit >= 1.0.3
+%endif
 
 Prereq: /sbin/chkconfig /etc/init.d /sbin/service
 
@@ -148,9 +155,20 @@
 %patch49 -p1 -b .bz178436
 %patch50 -p1 -b .bz178931
 %patch51 -p1 -b .mail_i18n
+%patch52 -p1 -b .bz181439
 
 %build
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror"
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror" \
+%if %{WITH_SELINUX}
+WITH_SELINUX=1 \
+%endif
+%if %{WITH_PAM}
+WITH_PAM=1 \
+%endif
+%if %{WITH_AUDIT}
+WITH_AUDIT=1 \
+%endif
+;
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -205,6 +223,10 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 4:4.1-52.FC5
+- fix bug 181439: enable easier selection of optional 'WITH_*'
+  compilation features
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4:4.1-51.FC5.1
 - bump again for double-long bug on ppc(64)