packages: php/php.spec - xml breakage checker from PHP_5_2

[glen]

Author: glen                         Date: Wed Apr 14 10:34:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- xml breakage checker from PHP_5_2

---- Files affected:
packages/php:
   php.spec (1.866 -> 1.867) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.866 packages/php/php.spec:1.867
--- packages/php/php.spec:1.866	Wed Apr 14 09:24:27 2010
+++ packages/php/php.spec	Wed Apr 14 12:34:47 2010
@@ -204,7 +204,7 @@
 BuildRequires:	libtool >= 1.4.3
 %endif
 #BuildRequires:	libwrap-devel
-BuildRequires:	libxml2-devel >= 2.5.10
+BuildRequires:	libxml2-devel >= 1:2.7.6-4
 BuildRequires:	libxslt-devel >= 1.1.0
 %{?with_mm:BuildRequires:	mm-devel >= 1.3.0}
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
@@ -987,8 +987,8 @@
 Group:		Libraries
 URL:		http://www.php.net/manual/en/book.mysqli.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
 %{?with_mysqlnd:Requires:	%{name}-mysqlnd = %{epoch}:%{version}-%{release}}
+Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
 Provides:	php(mysqli)
 
 %description mysqli
@@ -1143,8 +1143,8 @@
 Group:		Libraries
 URL:		http://www.php.net/manual/en/ref.pdo-mysql.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 %{?with_mysqlnd:Requires:	%{name}-mysqlnd = %{epoch}:%{version}-%{release}}
+Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-mysql)
 Obsoletes:	php-pecl-PDO_MYSQL
 
@@ -2084,6 +2084,9 @@
 %{__make} -f Makefile.cli
 [ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -qn)" = cli ] || exit 1
 
+# check for stupid xml parse breakage where &lt; and &gt; just get lost in parse result
+./sapi/cli/php -n -dextension_dir=modules -dextension=xml.so -r '$p = xml_parser_create(); xml_parse_into_struct($p, "<x>&lt;</x>", $vals, $index); exit((int )empty($vals[0]["value"]));'
+
 # Generate stub .ini files for each extension
 rm -rf conf.d
 install -d conf.d
@@ -3077,6 +3080,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.867  2010/04/14 10:34:47  glen
+- xml breakage checker from PHP_5_2
+
 Revision 1.866  2010/04/14 07:24:27  glen
 - updated todo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.866&r2=1.867&f=u