SPECS (AC-branch): php.spec - for now build with bundled xmlrpc-ep...

[glen]

Author: glen                         Date: Wed Jun  6 15:33:11 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- for now build with bundled xmlrpc-epi. see #41611

---- Files affected:
SPECS:
   php.spec (1.631.2.41 -> 1.631.2.42) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.631.2.41 SPECS/php.spec:1.631.2.42
--- SPECS/php.spec:1.631.2.41	Fri Jun  1 10:50:11 2007
+++ SPECS/php.spec	Wed Jun  6 17:33:06 2007
@@ -71,7 +71,7 @@
 %undefine	with_filter
 %endif
 
-%define	_rel 1
+%define	_rel 1.1
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr):	Le langage de script embarque-HTML PHP
 Summary(pl):	Język skryptowy PHP
@@ -138,9 +138,7 @@
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	db-devel >= 4.0
 BuildRequires:	elfutils-devel
-%if %{with xmlrpc}
-BuildRequires:	expat-devel
-%endif
+%{?with_xmlrpc:BuildRequires:	expat-devel}
 %{?with_fcgi:BuildRequires:	fcgi-devel}
 %{?with_fdf:BuildRequires:	fdftk-devel}
 BuildRequires:	flex
@@ -186,7 +184,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
@@ -1606,7 +1603,7 @@
 rm -rf ext/pcre/pcrelib
 rm -rf ext/pdo_sqlite/sqlite
 #rm -rf ext/soap/interop
-rm -rf ext/xmlrpc/libxmlrpc
+#rm -rf ext/xmlrpc/libxmlrpc -- system one is broken on 64bit arches
 
 %ifarch ppc ppc64
 # this test hungs on ac-ppc
@@ -1790,7 +1787,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-xsl=shared \
 	--with-zlib=shared \
 	--with-zlib-dir=shared,/usr \
@@ -2731,6 +2728,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.631.2.42  2007/06/06 15:33:06  glen
+- for now build with bundled xmlrpc-epi. see #41611
+
 Revision 1.631.2.41  2007/06/01 08:50:11  glen
 - ah, what the hell, disable tests
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.631.2.41&r2=1.631.2.42&f=u