SPECS: apache.spec - add webapps.d

[glen]

Author: glen                         Date: Mon Nov 21 09:29:12 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add webapps.d

---- Files affected:
SPECS:
   apache.spec (1.416 -> 1.417) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.416 SPECS/apache.spec:1.417
--- SPECS/apache.spec:1.416	Wed Oct 26 18:19:45 2005
+++ SPECS/apache.spec	Mon Nov 21 10:29:06 2005
@@ -35,7 +35,7 @@
 Summary(tr):	Lider WWW tarayýcý
 Name:		apache
 Version:	2.0.55
-Release:	2
+Release:	2.3
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -885,6 +885,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,monit} \
 	$RPM_BUILD_ROOT%{_var}/{log/{httpd,archiv/httpd},{run,cache}/apache,lock/mod_dav} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d} \
 	$RPM_BUILD_ROOT%{_datadir}/cgi-bin
 
 # prefork is default one
@@ -1039,6 +1040,15 @@
 	mv -f /etc/sysconfig/{apache.rpmsave,httpd}
 fi
 
+%triggerpostun -- %{name} < 2.0.55-2.3
+# make sure webapps.d is included
+cp -f /etc/httpd/httpd.conf/10_httpd.conf{,.rpmsave}
+# this file is ugly, so just append new lines
+cat <<EOF >> /etc/httpd/httpd.conf/10_httpd.conf
+# Include webapps config
+Include webapps.d/*.conf
+EOF
+
 %posttrans
 # minimizing apache restarts logics. we restart webserver:
 #
@@ -1225,7 +1235,9 @@
 
 %attr(754,root,root) /etc/rc.d/init.d/httpd
 
+# TODO: switch to conf.d, instead of confusing *dir* httpd.conf
 %attr(750,root,root) %dir %{_sysconfdir}/httpd.conf
+%attr(750,root,root) %dir %{_sysconfdir}/webapps.d
 %attr(750,root,root) %dir %{_sysconfdir}/modules
 %attr(750,root,root) %dir %{_sysconfdir}/run
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_httpd.conf
@@ -1655,6 +1667,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.417  2005/11/21 09:29:06  glen
+- add webapps.d
+
 Revision 1.416  2005/10/26 16:19:45  glen
 - main package does not need nor use apxs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.416&r2=1.417&f=u