- use php-apache2handler.ini instead of php-apache.ini for apache2

Changed files:
    php.spec -> 1.455

diff --git a/php.spec b/php.spec
index 33a733d8f29f5c99a3c48a2e3771e2731a2c4e28..2fbffd2611e4baa48ae74d46a2bffe4332153e7b 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -77,7 +77,7 @@ Summary(ru):  PHP 
 Summary(uk):   PHP ÷ÅÒÓ¦§ 5 - ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
 Version:       5.0.4
-Release:       7%{?with_hardening:hardened}
+Release:       7%{?with_hardening:hardened}.1
 Epoch:         4
 Group:         Libraries
 License:       PHP
@@ -1631,6 +1631,7 @@ install %{SOURCE2} php.gif $RPM_BUILD_ROOT%{httpdir}/icons
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir}
 %if %{_apache2}
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/httpd/httpd.conf/70_mod_php.conf
+mv $RPM_BUILD_ROOT%{_sysconfdir}/php-apache{,2handler}.ini
 %endif
 
 install %{SOURCE1} .
@@ -2225,9 +2226,11 @@ fi
 %defattr(644,root,root,755)
 %if %{_apache2}
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/httpd/httpd.conf/*_mod_php.conf
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache2handler.ini
+%else
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache.ini
 %endif
 %attr(755,root,root) %{apachelib}/libphp5.so
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache.ini
 
 %files fcgi
 %defattr(644,root,root,755)