rpms/exim/FC-4 exim-4.52-dynamic-pcre.patch, NONE, 1.1 exim.spec, 1.5, 1.6

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/extras/rpms/exim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27067

Modified Files:
	exim.spec 
Added Files:
	exim-4.52-dynamic-pcre.patch 
Log Message:
dynamic pcre

exim-4.52-dynamic-pcre.patch:

--- NEW FILE exim-4.52-dynamic-pcre.patch ---
--- exim-4.52/OS/Makefile-Base.pcre	2005-07-01 12:09:15.000000000 +0100
+++ exim-4.52/OS/Makefile-Base	2005-08-25 14:28:19.000000000 +0100
@@ -96,14 +96,14 @@ config.h: Makefile buildconfig ../src/co
 # therefore always be run, even if the files exist. This shouldn't in fact be a
 # problem, but it does no harm. Other make programs will just ignore this.
 
-.PHONY: all allexim buildauths buildlookups buildpcre buildrouters \
+.PHONY: all allexim buildauths buildlookups buildrouters \
         buildtransports checklocalmake clean
 
 
 # This is the real default target for all the various exim binaries and
 # scripts, once the configuring stuff is done.
 
-allexim: config.h buildpcre $(EXIM_MONITOR) exicyclog exinext exiwhat \
+allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \
         exigrep eximstats exipick exiqgrep exiqsumm \
         transport-filter.pl convert4r3 convert4r4 \
         exim_checkaccess \
@@ -314,7 +314,7 @@ OBJ_EXIM = acl.o child.o crypt16.o daemo
         local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \
         $(OBJ_WITH_OLD_DEMIME) $(OBJ_EXPERIMENTAL)
 
-exim:   pcre/libpcre.a lookups/lookups.a auths/auths.a \
+exim:   lookups/lookups.a auths/auths.a \
         routers/routers.a transports/transports.a \
         $(OBJ_EXIM) version.c
 	@echo " "
@@ -325,7 +325,7 @@ exim:   pcre/libpcre.a lookups/lookups.a
 	rm -f exim
 	@echo "$(LNCC) -o exim"
 	$(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
-	  pcre/libpcre.a \
+	  -lpcre \
 	  routers/routers.a transports/transports.a lookups/lookups.a \
 	  auths/auths.a \
 	  $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \
@@ -429,14 +429,14 @@ MONBIN = em_StripChart.o $(EXIMON_TEXTPO
 
 OBJ_MONBIN = util-spool_in.o util-store.o util-string.o tod.o tree.o $(MONBIN)
 
-eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) pcre/libpcre.a \
+eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \
             ../exim_monitor/em_version.c
 	@echo "$(CC) exim_monitor/em_version.c"
 	$(FE)$(CC) -o em_version.o -c \
 	  $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
 	@echo "$(LNCC) -o eximon.bin"
 	$(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
-	$(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 pcre/libpcre.a \
+	$(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 -lpcre \
 	  $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc
 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
 	  echo $(STRIP_COMMAND) eximon.bin; \
--- exim-4.52/src/exim.h.pcre	2005-07-01 12:09:15.000000000 +0100
+++ exim-4.52/src/exim.h	2005-08-25 14:26:40.000000000 +0100
@@ -414,7 +414,7 @@ extern int ferror(FILE *);
 
 /* The header from the PCRE regex package */
 
-#include "pcre/pcre.h"
+#include <pcre.h>
 
 /* Exim includes are in several files. Note that local_scan.h #includes
 mytypes.h and store.h, so we don't need to mention them explicitly. */
--- exim-4.52/exim_monitor/em_hdr.h.pcre	2005-07-01 12:09:15.000000000 +0100
+++ exim-4.52/exim_monitor/em_hdr.h	2005-08-25 14:26:40.000000000 +0100
@@ -87,7 +87,7 @@ anything. */
 
 /* Regular expression include */
 
-#include "pcre/pcre.h"
+#include <pcre.h>
 
 /* Includes from the main source of Exim. We need to have MAXPACKET defined for
 the benefit of structs.h. One of these days I should tidy up this interface so


Index: exim.spec
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- exim.spec	1 Jul 2005 15:56:28 -0000	1.5
+++ exim.spec	25 Aug 2005 14:17:14 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.52
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -24,10 +24,11 @@
 Patch12: exim-4.33-cyrus.patch
 Patch13: exim-4.43-pamconfig.patch
 Patch14: exim-4.50-spamdconf.patch
+Patch15: exim-4.52-dynamic-pcre.patch
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel XFree86-devel pam-devel
-BuildRequires: lynx
+BuildRequires: lynx pcre-devel
 BuildRequires: cyrus-sasl-devel openldap-devel openssl-devel
 PreReq: cyrus-sasl openldap openssl
 
@@ -75,6 +76,7 @@
 %patch12 -p1 -b .cyrus
 %patch13 -p1 -b .pam
 %patch14 -p1 -b .spamd
+%patch15 -p1 -b .pcre
 
 %build
 %ifnarch s390 s390x
@@ -283,6 +285,9 @@
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Thu Aug 25 2005 David Woodhouse <dwmw2 at redhat.com> 4.52-2
+- Use system PCRE
+
 * Fri Jul  1 2005 David Woodhouse <dwmw2 at redhat.com> 4.52-1
 - Update to Exim 4.52