SPECS: php.spec - AC-branch merge (use bundled xmlrpc-epi, fcgi er...

[glen]

Author: glen                         Date: Mon Nov 12 09:55:27 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge (use bundled xmlrpc-epi, fcgi error loglines patch)

---- Files affected:
SPECS:
   php.spec (1.700 -> 1.701) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.700 SPECS/php.spec:1.701
--- SPECS/php.spec:1.700	Mon Nov 12 10:39:41 2007
+++ SPECS/php.spec	Mon Nov 12 10:55:21 2007
@@ -47,6 +47,7 @@
 %bcond_without	apache2		# disable building apache 2.x module
 %bcond_without	fcgi		# disable building FCGI SAPI
 %bcond_without	zts		# disable experimental-zts
+%bcond_with	system_xmlrpc_epi	# use system xmlrpc-epi library (broken on 64bit arches, see http://bugs.php.net/41611)
 %bcond_with	tests		# default off; test process very often hangs on builders; perform "make test"
 %bcond_with	versioning	# build with experimental versioning (to load php4/php5 into same apache)
 
@@ -129,6 +130,8 @@
 Patch29:	%{name}-config-dir.patch
 Patch30:	%{name}-bug-42952.patch
 Patch31:	%{name}-fcgi-graceful.patch
+Patch32:	%{name}-apr-apu.patch
+Patch33:	%{name}-fcgi-error_log-no-newlines.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -142,6 +145,7 @@
 BuildRequires:	elfutils-devel
 %if %{with xmlrpc}
 BuildRequires:	expat-devel
+%{?with_system_xmlrpc_epi:BuildRequires:    xmlrpc-epi-devel}
 %endif
 %{?with_fcgi:BuildRequires:	fcgi-devel}
 %{?with_fdf:BuildRequires:	fdftk-devel}
@@ -188,7 +192,6 @@
 BuildRequires:	t1lib-devel
 %{?with_tidy:BuildRequires:	tidy-devel}
 %{?with_odbc:BuildRequires:	unixODBC-devel}
-%{?with_xmlrpc:BuildRequires:	xmlrpc-epi-devel}
 BuildRequires:	zlib-devel >= 1.0.9
 %if %{with apache1}
 BuildRequires:	apache1-devel
@@ -1597,6 +1600,8 @@
 %patch29 -p1
 %patch30 -p1
 %patch31 -p1
+%patch32 -p1
+%patch33 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -1614,7 +1619,9 @@
 rm -rf ext/pcre/pcrelib
 rm -rf ext/pdo_sqlite/sqlite
 #rm -rf ext/soap/interop
+%if %{without system_xmlrpc_epi}
 rm -rf ext/xmlrpc/libxmlrpc
+%endif
 
 %ifarch ppc ppc64
 # this test hungs on ac-ppc
@@ -1805,7 +1812,7 @@
 	%{?with_tidy:--with-tidy=shared} \
 	--with-tiff-dir=/usr \
 	%{?with_odbc:--with-unixODBC=shared,/usr} \
-	%{!?with_xmlrpc:--without-xmlrpc}%{?with_xmlrpc:--with-xmlrpc=shared,/usr} \
+	%{!?with_xmlrpc:--without-xmlrpc}%{?with_xmlrpc:--with-xmlrpc=shared%{?with_system_xmlrpc_epi:,/usr}} \
 	--with-xsl=shared \
 	--with-zlib=shared \
 	--with-zlib-dir=shared,/usr \
@@ -2752,6 +2759,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.701  2007-11-12 09:55:21  glen
+- AC-branch merge (use bundled xmlrpc-epi, fcgi error loglines patch)
+
 Revision 1.700  2007-11-12 09:39:41  glen
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.700&r2=1.701&f=u