SPECS (DEVEL): php4.spec - fixed php-SAPI.ini reading for apache2 ...

[glen]

Author: glen                         Date: Fri Jul 15 16:35:10 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- fixed php-SAPI.ini reading for apache2 (trigger included)

---- Files affected:
SPECS:
   php4.spec (1.453.2.11 -> 1.453.2.12) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.453.2.11 SPECS/php4.spec:1.453.2.12
--- SPECS/php4.spec:1.453.2.11	Fri Jul 15 17:42:56 2005
+++ SPECS/php4.spec	Fri Jul 15 18:35:05 2005
@@ -76,7 +76,7 @@
 Summary(uk):	PHP ÷ĹŇÓŚ§ 4 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php4
 Version:	4.4.0
-Release:	2.11%{?with_hardening:hardened}
+Release:	2.16%{?with_hardening:hardened}
 Epoch:		3
 Group:		Libraries
 License:	PHP
@@ -1891,9 +1891,11 @@
 %{?with_java:install ext/java/php_java.jar $RPM_BUILD_ROOT%{extensionsdir}}
 
 install php.ini	$RPM_BUILD_ROOT%{_sysconfdir}/php.ini
-for i in %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8}; do
-	install $i $RPM_BUILD_ROOT%{_sysconfdir}/$(basename $i|sed -e "s at php4@php at g")
-done
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini
+install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi.ini
+install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache.ini
+install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
+install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
 
 install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/httpd/icons
 install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/apache/icons
@@ -1936,6 +1938,15 @@
 %post	common -p /sbin/ldconfig
 %postun	common -p /sbin/ldconfig
 
+%if %{with apache2}
+# for fixed php-SAPI.ini, the poor php-apache.ini was never read for apache2
+%triggerpostun -n apache-mod_php4 -- apache-mod_php4 < 3:4.4.0-2.16, php4 < 3:4.3.11-4.16
+if [ -f %{_sysconfdir}/php-apache.ini.rpmsave ]; then
+	cp -f %{_sysconfdir}/php-apache2handler.ini{,.rpmnew}
+	mv -f %{_sysconfdir}/php-apache.ini.rpmsave %{_sysconfdir}/php-apache2handler.ini
+fi
+%endif
+
 %post bcmath
 [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service apache restart
 [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service httpd restart
@@ -2463,9 +2474,6 @@
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/apache/conf.d/*_mod_php4.conf
 %attr(755,root,root) %{_libdir}/apache1/libphp4.so
-# FIXME
-# - really share config with apache1/apache2?
-# - name it by real sapi name? (apxs, apxs2?)
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache.ini
 /home/services/apache/icons/*
 %endif
@@ -2475,7 +2483,7 @@
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/httpd/httpd.conf/*_mod_php4.conf
 %attr(755,root,root) %{_libdir}/apache/libphp4.so
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache.ini
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache2handler.ini
 /home/services/httpd/icons/*
 %endif
 
@@ -2940,6 +2948,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.453.2.12  2005/07/15 16:35:05  glen
+- fixed php-SAPI.ini reading for apache2 (trigger included)
+
 Revision 1.453.2.11  2005/07/15 15:42:56  glen
 - also use %service macro for main php module package
 
================================================================

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