rpms/exim/devel exim-4.50-config.patch,1.7,1.8 exim.spec,1.51,1.52

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32495

Modified Files:
	exim-4.50-config.patch exim.spec 
Log Message:
fix largefile support

exim-4.50-config.patch:

Index: exim-4.50-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim-4.50-config.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- exim-4.50-config.patch	22 Apr 2008 17:30:01 -0000	1.7
+++ exim-4.50-config.patch	13 Aug 2008 13:29:53 -0000	1.8
@@ -244,7 +244,7 @@
 -# CFLAGS=-O -I/usr/local/include
 -# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
 +USE_TCP_WRAPPERS=yes
-+CFLAGS=-g -O
++CFLAGS += $(RPM_OPT_FLAGS) $(PIE)
 +EXTRALIBS_EXIM=-lwrap -lpam -ldl
  #
  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- exim.spec	22 Apr 2008 17:30:01 -0000	1.51
+++ exim.spec	13 Aug 2008 13:29:53 -0000	1.52
@@ -12,7 +12,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.69
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -186,11 +186,11 @@
 
 %build
 %ifnarch s390 s390x sparc sparcv9 sparcv9v sparc64 sparc64v
-	PIE=-fpie
+	export PIE=-fpie
 %else
-	PIE=-fPIE
+	export PIE=-fPIE
 %endif
-make CFLAGS="$RPM_OPT_FLAGS $PIE" LFLAGS=-pie _lib=%{_lib} FULLECHO=
+make LFLAGS=-pie _lib=%{_lib} FULLECHO=
 
 %if 0%{?buildsa}
 # build sa-exim
@@ -483,6 +483,10 @@
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Wed Aug 13 2008 David Woodhouse <David.Woodhouse at intel.com> 4.69-6
+- Add $RPM_OPT_FLAGS in config instead of overriding on make command line.
+  (to fix the setting of largefile options which we were killing)
+
 * Sat Apr 19 2008 David Woodhouse <dwmw2 at infradead.org> 4.69-5
 - Add dynamic lookup patch, split into subpackages (#199256)