SPECS: php.spec rel 9; back to using libxml2 instead of expat since bug 459...

[arekm]

Author: arekm                        Date: Mon Mar 30 08:50:03 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
rel 9; back to using libxml2 instead of expat since bug 45996 is fixed in 5.2.9 release

---- Files affected:
SPECS:
   php.spec (1.790 -> 1.791) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.790 SPECS/php.spec:1.791
--- SPECS/php.spec:1.790	Thu Mar 19 17:00:24 2009
+++ SPECS/php.spec	Mon Mar 30 10:49:58 2009
@@ -85,7 +85,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel 8
+%define		rel 9
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -155,8 +155,6 @@
 Patch40:	%{name}-fpm.patch
 Patch41:	%{name}-fpm-config.patch
 Patch42:	%{name}-fpm-initdir.patch
-# drop when http://bugs.php.net/bug.php?id=45996 solved
-Patch43:	%{name}-xml-force-expat.patch
 Patch44:	%{name}-include_path.patch
 Patch45:	%{name}-imap-annotations.patch
 Patch46:	%{name}-imap-myrights.patch
@@ -171,8 +169,6 @@
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	db-devel >= 4.0
 BuildRequires:	elfutils-devel
-# until php bug#45996 is solved
-BuildRequires:	expat-devel
 %if %{with xmlrpc}
 BuildRequires:	expat-devel
 %{?with_system_xmlrpc_epi:BuildRequires:    xmlrpc-epi-devel}
@@ -1685,7 +1681,6 @@
 %patch42 -p1
 %endif
 
-%patch43 -p1
 %patch44 -p1
 %patch45 -p1
 %patch46 -p1
@@ -1861,9 +1856,9 @@
 	--with-db4 \
 	--enable-dbase=shared \
 %if %{with xmlrpc}
-	--with-libexpat-dir=shared,/usr \
+	--with-expat-dir=shared,/usr \
 %else
-	--without-libexpat-dir \
+	--without-expat-dir \
 %endif
 	%{?with_fdf:--with-fdftk=shared} \
 	--with-iconv=shared \
@@ -2893,6 +2888,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.791  2009/03/30 08:49:58  arekm
+rel 9; back to using libxml2 instead of expat since bug 45996 is fixed in 5.2.9 release
+
 Revision 1.790  2009/03/19 16:00:24  glen
 - does not require logrotate; rel 8
 
================================================================

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