packages (PHP_5_2): php/php.spec - load pcre before spl; rel 10; LP#487462

[glen]

Author: glen                         Date: Thu Nov 26 12:56:51 2009 GMT
Module: packages                      Tag: PHP_5_2
---- Log message:
- load pcre before spl; rel 10; LP#487462

---- Files affected:
packages/php:
   php.spec (1.805.2.26 -> 1.805.2.27) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.26 packages/php/php.spec:1.805.2.27
--- packages/php/php.spec:1.805.2.26	Wed Nov 25 09:53:02 2009
+++ packages/php/php.spec	Thu Nov 26 13:56:45 2009
@@ -111,7 +111,7 @@
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		php
 Version:	5.2.11
-Release:	9
+Release:	10
 Epoch:		4
 License:	PHP
 Group:		Libraries
@@ -2093,6 +2093,8 @@
 		conf="%{_sysconfdir}/conf.d/$mod.ini"
 		# xml needs to be loaded before wddx
 		[ "$mod" = "wddx" ] && conf="%{_sysconfdir}/conf.d/xml_$mod.ini"
+		# pre needs to be loaded before SPL
+		[ "$mod" = "pcre" ] && conf="%{_sysconfdir}/conf.d/PCRE.ini"
 		# spl needs to be loaded before mysqli
 		[ "$mod" = "spl" ] && conf="%{_sysconfdir}/conf.d/SPL.ini"
 		echo "+ $conf"
@@ -2743,7 +2745,7 @@
 %if %{with pcre}
 %files pcre
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pcre.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/PCRE.ini
 %attr(755,root,root) %{php_extensiondir}/pcre.so
 %endif
 
@@ -2968,6 +2970,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.805.2.27  2009/11/26 12:56:45  glen
+- load pcre before spl; rel 10; LP#487462
+
 Revision 1.805.2.26  2009/11/25 08:53:02  glen
 - drop simplexml Suggest spl (requirement from spl side makes loop)
 
================================================================

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