- added (conditional) apr1 patch (updates for apr+apr-util 1.0.0 API)

- httpd.conf and mod_autoindex.conf fixes after separation

Changed files:
    apache.spec -> 1.339

diff --git a/apache.spec b/apache.spec
index 80d48ad49f837f4f236736e24dbdb328ad8f4c74..9792bccf61e7ed98e8708e88296aae44505a0975 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -81,6 +81,7 @@ Patch20:      %{name}-conffile-path.patch
 Patch21:       %{name}-apxs.patch
 # http://www.telana.com/peruser.php
 Patch22:       httpd-2.0.50-peruser-r3.patch
+Patch23:       %{name}-apr1.patch
 URL:           http://httpd.apache.org/
 BuildRequires: automake
 %if %{with apr1}
@@ -697,6 +698,7 @@ Modu
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%{?with_apr1:%patch23 -p1}
 
 %{__perl} -pi -e "s@/usr/local/bin/perl@%{__perl}@" $(grep -rl "/usr/local/bin/perl" *)