rpms/milter-greylist/devel milter-greylist.spec,1.19,1.20

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16939/devel

Modified Files:
	milter-greylist.spec 
Log Message:
- updated to final 4.0
- fixed conflicts between libbind and libresolv by linking them manually



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- milter-greylist.spec	14 Oct 2007 14:07:27 -0000	1.19
+++ milter-greylist.spec	10 Nov 2007 17:22:15 -0000	1.20
@@ -14,14 +14,12 @@
 %global rundir		%_var/run/%name
 %global __chkconfig	/sbin/chkconfig
 
-%global beta		rc1
-
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
 Version:	4.0
-Release:	%release_func 0.2%{?beta:.%beta}
+Release:	%release_func 1
 License:	BSD w/ advertising
 Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -74,7 +72,7 @@
 %setup -q %{?beta:-n %name-%version%beta}
 %patch0 -p1 -b .sysv
 
-sed -i -e 's!--rpath!\0X!g' configure
+sed -i -e 's!/usr/lib/libresolv.a!/no-such-lib.a!g' configure
 sed -i -e 's!^\#\?user .*!user "%username"!;
            s!^\#socket !socket !;
 	   s!^pidfile .*!\#\0!;' greylist.conf
@@ -91,9 +89,10 @@
 
 %define makeflags	TEST=false BINDIR=%_sbindir
 %build
-export CPPFLAGS="-DUSE_CURL -DUSE_GEOIP $(pkg-config --cflags-only-I libcurl libbind)"
-export LIBS="-Wl,--as-needed -lGeoIP $(pkg-config --libs libcurl libbind)" 
+export CPPFLAGS="-DUSE_CURL -DUSE_GEOIP -D_REENTRANT $(pkg-config --cflags-only-I libcurl libbind)"
+export LDFLAGS="-Wl,--as-needed -lbind -lcurl -lGeoIP"
 %configure \
+	--disable-rpath				\
 	--with-user=%username			\
 	--enable-dnsrbl				\
 	--disable-drac				\
@@ -165,6 +164,13 @@
 %endif
 
 %changelog
+* Sat Nov 10 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.0-1
+- updated to final 4.0
+- fixed conflicts between libbind and libresolv by linking them manually
+
+* Mon Oct 29 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.0-0.3.rc2
+- updated to 4.0rc2
+
 * Sun Oct 14 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.0-0.2.rc1
 - updated to 4.0rc1
 - built with curl and GeoIP support