From 80b4e10610b2baca59d1ecf8c960d6a8a5849eea Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 25 Jul 2003 11:49:52 +0000
Subject: [PATCH] - more updates (sync with RA-branch)

Changed files:
    apache1.spec -> 1.17
---
 apache1.spec | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/apache1.spec b/apache1.spec
index 7da94ed..8740289 100644
--- a/apache1.spec
+++ b/apache1.spec
@@ -66,7 +66,6 @@ Patch19:	%{name}-PLD-nov6.patch
 Patch20:	%{name}-configdir_skip_backups.patch
 Patch21:	%{name}-apxs-quiet.patch
 Patch22:	%{name}-db4.patch
-Patch23:	%{name}-security_htdigest_bufferoverflow.patch
 URL:		http://www.apache.org/
 BuildRequires:	db-devel >= 4.1
 BuildRequires:	mm-devel >= 1.3.0
@@ -721,10 +720,9 @@ wirtualnych.
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
-#%patch23 -p1
 
 %build
-OPTIM="%{rpmcflags}" \
+OPTIM="%{rpmcflags} -DHARD_SERVER_LIMIT=2048" \
 ./configure \
 	--prefix=%{_prefix} \
 	--sysconfdir=%{_sysconfdir} \
@@ -769,7 +767,7 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
 	$RPM_BUILD_ROOT/var/{log/{httpd,archiv/httpd},run/apache}
 
 %{__make} install-quiet \
-	root=$RPM_BUILD_ROOT
+	root="$RPM_BUILD_ROOT"
 
 mv -f $RPM_BUILD_ROOT%{_datadir}/html/manual $RPM_BUILD_ROOT%{_datadir}
 
@@ -1377,7 +1375,9 @@ fi
 %{_datadir}/manual/configuring.html.en
 %lang(fr) %{_datadir}/manual/configuring.html.fr
 %lang(ja) %{_datadir}/manual/configuring.html.ja.jis
-#%{_datadir}/manual/content-negotiation.html
+%{_datadir}/manual/content-negotiation.html.html
+%{_datadir}/manual/content-negotiation.html.en
+%lang(ja) %{_datadir}/manual/content-negotiation.html.ja.jis
 %{_datadir}/manual/custom-error.html.html
 %{_datadir}/manual/custom-error.html.en
 %lang(fr) %{_datadir}/manual/custom-error.html.fr
@@ -1446,6 +1446,7 @@ fi
 %{_datadir}/manual/mod/core.html.html
 %{_datadir}/manual/mod/core.html.en
 %lang(fr) %{_datadir}/manual/mod/core.html.fr
+%lang(ja) %{_datadir}/manual/mod/core.html.ja.jis
 %{_datadir}/manual/mod/directive-dict.html.html
 %{_datadir}/manual/mod/directive-dict.html.en
 %lang(fr) %{_datadir}/manual/mod/directive-dict.html.fr
@@ -1468,6 +1469,7 @@ fi
 %{_datadir}/manual/mod/mod_access.html.html
 %{_datadir}/manual/mod/mod_access.html.en
 %lang(ja) %{_datadir}/manual/mod/mod_access.html.ja.jis
+%{_datadir}/manual/mod/mod_alias.html.html
 %{_datadir}/manual/mod/mod_alias.html.en
 %lang(ja) %{_datadir}/manual/mod/mod_alias.html.ja.jis
 %{_datadir}/manual/mod/mod_asis.html.html
@@ -1483,7 +1485,9 @@ fi
 %lang(ja) %{_datadir}/manual/mod/mod_env.html.ja.jis
 %{_datadir}/manual/mod/mod_include.html
 %{_datadir}/manual/mod/mod_log_agent.html
-#%{_datadir}/manual/mod/mod_log_config.html
+%{_datadir}/manual/mod/mod_log_config.html.html
+%{_datadir}/manual/mod/mod_log_config.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_log_config.html.ja.jis
 %{_datadir}/manual/mod/mod_log_referer.html
 %{_datadir}/manual/mod/mod_mime.html.html
 %{_datadir}/manual/mod/mod_mime.html.en
@@ -1580,7 +1584,7 @@ fi
 %lang(ru) %{_datadir}/html/index.html.ru.ucs4
 %lang(ru) %{_datadir}/html/index.html.ru.utf8
 %lang(sv) %{_datadir}/html/index.html.se
-#%lang(zh_TW) %{_datadir}/html/index.html.zh
+%lang(zh_TW) %{_datadir}/html/index.html.zh-tw.big5
 
 %{_datadir}/html/*.gif
 %{_datadir}/errordocs
@@ -1619,6 +1623,7 @@ fi
 %attr(755,root,root) %{_libexecdir}/mod_auth.so
 %attr(755,root,root) %{_bindir}/htpasswd
 %{_datadir}/manual/howto/auth.html
+%{_datadir}/manual/mod/mod_auth.html.html
 %{_datadir}/manual/mod/mod_auth.html.en
 %lang(ja) %{_datadir}/manual/mod/mod_auth.html.ja.jis
 
-- 
2.44.0