SPECS: php.spec - use php-apache2handler.ini instead of php-apache...

[gotar]

Author: gotar                        Date: Sun Jul 24 21:29:26 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use php-apache2handler.ini instead of php-apache.ini for apache2

---- Files affected:
SPECS:
   php.spec (1.454 -> 1.455) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.454 SPECS/php.spec:1.455
--- SPECS/php.spec:1.454	Sun Jul  3 02:21:44 2005
+++ SPECS/php.spec	Sun Jul 24 23:29:21 2005
@@ -78,7 +78,7 @@
 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
@@ -1632,6 +1632,7 @@
 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} .
@@ -2226,9 +2227,11 @@
 %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)
@@ -2593,6 +2596,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.455  2005/07/24 21:29:21  gotar
+- use php-apache2handler.ini instead of php-apache.ini for apache2
+
 Revision 1.454  2005/07/03 00:21:44  ankry
 - tabs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.454&r2=1.455&f=u