- removed access.conf and srm.conf

Changed files:
    apache-httpd.conf -> 1.13
    apache.spec -> 1.101

diff --git a/apache-httpd.conf b/apache-httpd.conf
index e0b4c7a185df6879fded20912531886859b30059..3096cb02963d3cba7be79825dac4dc0a59a41b7a 100644 (file)
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -7,6 +7,10 @@
 # such as the number of concurrent requests it can handle or where it can
 # find its configuration files.
 
+### Disable usage obsoletes access.conf and srm.conf 
+ResourceConfig  /dev/null
+AccessConfig    /dev/null
+
 ### ServerType
 # is either inetd, or standalone. Inetd mode is only supported on Unix
 # platforms.

diff --git a/apache.spec b/apache.spec
index cb55e0a3ba866818f169691172de1d1e40cdf9be..2332bf03cc9217f075773b3a07668b8c8bd0f8c1 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -15,9 +15,7 @@ Source1:      apache.init
 Source2:       apache.logrotate
 Source3:       apache-icons.tar.gz
 Source4:       apache.sysconfig
-Source5:       apache-access.conf
 Source6:       apache-httpd.conf
-Source7:       apache-srm.conf
 Source8:       apache-mod_vhost_alias.conf
 Source9:       apache-mod_status.conf
 Source10:      apache-mod_proxy.conf
@@ -439,9 +437,7 @@ touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer}_log
 
 install errordocs/* $RPM_BUILD_ROOT%{_datadir}/errordocs
 
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/access.conf
 install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/srm.conf
 
 install %{SOURCE8}  $RPM_BUILD_ROOT%{_sysconfdir}/mod_vhost_alias.conf
 install %{SOURCE9}  $RPM_BUILD_ROOT%{_sysconfdir}/mod_status.conf
@@ -892,9 +888,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(754,root,root) /etc/rc.d/init.d/httpd
 
 %attr(750,root,root) %dir %{_sysconfdir}
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/access.conf
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/srm.conf
 %attr(640,root,root) %{_sysconfdir}/magic
 
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/*