SPECS: php4.spec - merge from php.spec: wddx module needs xml modu...

[glen]

Author: glen                         Date: Thu Jan  5 22:05:22 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge from php.spec: wddx module needs xml module loaded first

---- Files affected:
SPECS:
   php4.spec (1.509 -> 1.510) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.509 SPECS/php4.spec:1.510
--- SPECS/php4.spec:1.509	Sun Dec 25 00:08:56 2005
+++ SPECS/php4.spec	Thu Jan  5 23:05:17 2006
@@ -1969,7 +1969,10 @@
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
 for so in modules/*.so; do
 	mod=$(basename $so .so)
-	cat > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/${mod}.ini <<EOF
+	conf="%{_sysconfdir}/conf.d/${mod}.ini"
+	# xml needs to be loaded before wddx
+	[ "$mod" = "wddx" ] && conf="%{_sysconfdir}/conf.d/xml_${mod}.ini"
+	cat > $RPM_BUILD_ROOT${conf} <<EOF
 ; Enable ${mod} extension module
 extension=${mod}.so
 EOF
@@ -3192,7 +3195,7 @@
 %files wddx
 %defattr(644,root,root,755)
 %doc ext/wddx/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/wddx.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*wddx.ini
 %attr(755,root,root) %{extensionsdir}/wddx.so
 %endif
 
@@ -3252,6 +3255,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.510  2006/01/05 22:05:17  glen
+- merge from php.spec: wddx module needs xml module loaded first
+
 Revision 1.509  2005/12/24 23:08:56  hawk
 - release 10 to rebuild with imap 2004g
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.509&r2=1.510&f=u