SPECS: php.spec - AC-branch merge

[glen]

Author: glen                         Date: Mon Nov 12 08:29:39 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge

---- Files affected:
SPECS:
   php.spec (1.697 -> 1.698) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.697 SPECS/php.spec:1.698
--- SPECS/php.spec:1.697	Mon Nov 12 09:15:25 2007
+++ SPECS/php.spec	Mon Nov 12 09:29:34 2007
@@ -47,7 +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	tests		# default off; test process very often hangs on buildersl; perform "make test"
+%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)
 
 %define apxs1		/usr/sbin/apxs1
@@ -1475,6 +1475,7 @@
 Summary(pl.UTF-8):	Moduł xmlrpc dla PHP
 Group:		Libraries
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-xml = %{epoch}:%{version}-%{release}
 Provides:	php(xmlrpc)
 
 %description xmlrpc
@@ -1616,6 +1617,13 @@
 #rm -rf ext/soap/interop
 rm -rf ext/xmlrpc/libxmlrpc
 
+%ifarch ppc ppc64
+# this test hungs on ac-ppc
+#mv ext/reflection/tests/007.php{,ignore}
+# this test gets killed by itself
+mv ext/standard/tests/general_functions/bug39322.phpt{,.broken}
+%endif
+
 cp -f Zend/LICENSE{,.Zend}
 
 %build
@@ -2745,6 +2753,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.698  2007-11-12 08:29:34  glen
+- AC-branch merge
+
 Revision 1.697  2007-11-12 08:15:25  glen
 - 5.2.5, lots of security enchancements. also resolves CVE-2007-4887.
 
================================================================

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