rpms/milter-greylist/devel milter-greylist.spec,1.38,1.39

[ensc]

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32715

Modified Files:
	milter-greylist.spec 
Log Message:
- conditionalized -upstart subpackage
- added conditional to build it with libbind (required for RHEL5)



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- milter-greylist.spec	20 Feb 2010 11:48:04 -0000	1.38
+++ milter-greylist.spec	20 Feb 2010 11:52:46 -0000	1.39
@@ -4,7 +4,9 @@
 ## Fedora Extras specific customization below...
 %bcond_without		fedora
 %bcond_without		noarch
+%bcond_without		upstart
 %bcond_with		spf
+%bcond_with		libbind
 ##
 
 %{?with_noarch:%global noarch	BuildArch:	noarch}
@@ -22,7 +24,7 @@
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	4.2.3
-Release:	%release_func 1301%{?beta}
+Release:	%release_func 1400%{?beta}
 License:	BSD with advertising
 Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -41,6 +43,7 @@ BuildRequires:		bison flex m4
 BuildRequires:		sendmail-devel %{?with_spf:libspf-devel}
 BuildRequires:		fedora-usermgmt-devel
 BuildRequires:		curl-devel GeoIP-devel
+%{?with_libbind:BuildRequires:	%_libdir/libbind.so}
 %{?FE_USERADD_REQ}
 
 %package sysvinit
@@ -128,8 +131,10 @@ done
 
 %define makeflags	TEST=false BINDIR=%_sbindir
 %build
-export CPPFLAGS="-DUSE_CURL -DUSE_GEOIP -D_GNU_SOURCE -D_REENTRANT $(pkg-config --cflags-only-I libcurl)"
-export LDFLAGS="-Wl,--as-needed $(pkg-config --libs libcurl) -lGeoIP"
+_comps="%{?with_libbind:libbind} libcurl"
+export CPPFLAGS="-DUSE_CURL -DUSE_GEOIP -D_GNU_SOURCE -D_REENTRANT $(pkg-config --cflags-only-I $_comps)"
+export LDFLAGS="-Wl,--as-needed $(pkg-config --libs $_comps) -lGeoIP"
+
 %configure \
 	--disable-rpath				\
 	--with-user=%username			\
@@ -158,6 +163,7 @@ touch $RPM_BUILD_ROOT%_var/run/milter-gr
 
 ## Remove the unwanted init-methods
 %{?_without_sysv:  rm -rf $RPM_BUILD_ROOT%_initrddir}
+%{!?with_upstart:  rm -rf $RPM_BUILD_ROOT/etc/init}
 
 
 %pre
@@ -213,15 +219,18 @@ rm -rf $RPM_BUILD_ROOT
   %config %_initrddir/*
 %endif
 
-
+%if 0%{?with_upstart:1}
 %files upstart
 %defattr(-,root,root,-)
 %config(noreplace) /etc/init/*
+%endif
 
 
 %changelog
-* Sat Feb 20 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.3-1301
+* Sat Feb 20 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.3-1400
 - added patches to fix races in dkim, geoip and p0f modules
+- conditionalized -upstart subpackage
+- added conditional to build it with libbind (required for RHEL5)
 
 * Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.3-1300
 - updated -upstart to upstart 0.6.3