SPECS: php4.spec - use conf.d for apache config fragment; rel 14

[glen]

Author: glen                         Date: Wed Dec 26 18:11:21 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use conf.d for apache config fragment; rel 14

---- Files affected:
SPECS:
   php4.spec (1.601 -> 1.602) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.601 SPECS/php4.spec:1.602
--- SPECS/php4.spec:1.601	Mon Dec 10 13:12:08 2007
+++ SPECS/php4.spec	Wed Dec 26 19:11:16 2007
@@ -74,7 +74,7 @@
 %undefine	with_msession
 %endif
 
-%define	_rel 13
+%define	_rel 14
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -1815,7 +1815,7 @@
 install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}} \
 	$RPM_BUILD_ROOT/home/services/{httpd,apache}/icons \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_bindir}} \
-	$RPM_BUILD_ROOT{/etc/apache/conf.d,/etc/httpd/httpd.conf} \
+	$RPM_BUILD_ROOT{/etc/apache/conf.d,/etc/httpd/conf.d} \
 	$RPM_BUILD_ROOT%{_mandir}/man1
 
 # install the apache modules' files
@@ -1873,7 +1873,7 @@
 
 %if %{with apache2}
 install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/httpd/icons
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/httpd/httpd.conf/70_mod_php4.conf
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/httpd/conf.d/70_mod_php4.conf
 install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
 %endif
 
@@ -1933,14 +1933,14 @@
 %define	extension_post \
 if [ "$1" = "1" ]; then \
 	[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart \
-	[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart \
+	[ ! -f /etc/httpd/conf.d/??_mod_php4.conf ] || %service -q httpd restart \
 fi
 
 # macro called at extension postun scriptlet
 %define	extension_postun \
 if [ "$1" = "0" ]; then \
 	[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart \
-	[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart \
+	[ ! -f /etc/httpd/conf.d/??_mod_php4.conf ] || %service -q httpd restart \
 fi
 
 %post	common -p /sbin/ldconfig
@@ -1958,7 +1958,7 @@
 
 # restart webserver at the end of transaction
 [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
+[ ! -f /etc/httpd/conf.d/??_mod_php4.conf ] || %service -q httpd restart
 
 %if %{with apache2}
 %triggerpostun -n apache-mod_php4 -- apache-mod_php4 < 3:4.4.0-2.16, php4 < 3:4.3.11-4.16
@@ -2594,7 +2594,7 @@
 %files -n apache-mod_php4
 %defattr(644,root,root,755)
 %doc sapi/apache2handler/{CREDITS,README}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/httpd.conf/*_mod_php4.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/conf.d/*_mod_php4.conf
 %dir %{_sysconfdir}/apache2handler.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini
 %attr(755,root,root) %{_libdir}/apache/libphp4.so
@@ -3136,6 +3136,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.602  2007-12-26 18:11:16  glen
+- use conf.d for apache config fragment; rel 14
+
 Revision 1.601  2007-12-10 12:12:08  hawk
 - release 13 (imap 2006k)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php4.spec?r1=1.601&r2=1.602&f=u