diff options
| author | jorton <jorton@fedoraproject.org> | 2005-12-07 16:45:38 +0000 |
|---|---|---|
| committer | jorton <jorton@fedoraproject.org> | 2005-12-07 16:45:38 +0000 |
| commit | 2724cce42cb99b7f3f9e6c081ec55eae1514fd79 (patch) | |
| tree | ae89aee95a0a0aff5f2695f8ff3ae688a15c76b7 | |
| parent | 9f9ccbc5d357f396e58955c1ab92e4d072ef49bf (diff) | |
| download | httpd-2724cce42cb99b7f3f9e6c081ec55eae1514fd79.tar.gz httpd-2724cce42cb99b7f3f9e6c081ec55eae1514fd79.tar.xz httpd-2724cce42cb99b7f3f9e6c081ec55eae1514fd79.zip | |
- strip manual to just English contenthttpd-2_2_0-3
| -rw-r--r-- | httpd.spec | 15 | ||||
| -rw-r--r-- | manual.conf | 12 |
2 files changed, 14 insertions, 13 deletions
@@ -7,7 +7,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.2.0 -Release: 2 +Release: 3 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -266,6 +266,16 @@ find $RPM_BUILD_ROOT%{contentdir}/manual \( \ -name \*.xml -o -name \*.xml.* -o -name \*.ent -o -name \*.xsl -o -name \*.dtd \ \) -print0 | xargs -0 rm -f +# Strip the manual down just to English and replace the typemaps with flat files: +set +x +for f in `find $RPM_BUILD_ROOT%{contentdir}/manual -name \*.html -type f`; do + if test -f ${f}.en; then + cp ${f}.en ${f} + rm ${f}.* + fi +done +set -x + install -m 644 $RPM_SOURCE_DIR/powered_by_fedora.png \ $RPM_BUILD_ROOT%{contentdir}/icons @@ -469,6 +479,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/httpd/build/*.sh %changelog +* Wed Dec 7 2005 Joe Orton <jorton@redhat.com> 2.2.0-3 +- strip manual to just English content + * Mon Dec 5 2005 Joe Orton <jorton@redhat.com> 2.2.0-2 - don't strip C-L from HEAD responses (Greg Ames, #110552) - load mod_proxy_balancer by default diff --git a/manual.conf b/manual.conf index eed5843..f2cbc8f 100644 --- a/manual.conf +++ b/manual.conf @@ -9,16 +9,4 @@ AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "/var/www/manual$1" AllowOverride None Order allow,deny Allow from all - - <Files *.html> - SetHandler type-map - </Files> - - SetEnvIf Request_URI ^/manual/de/ prefer-language=de - SetEnvIf Request_URI ^/manual/en/ prefer-language=en - SetEnvIf Request_URI ^/manual/fr/ prefer-language=fr - SetEnvIf Request_URI ^/manual/ja/ prefer-language=ja - SetEnvIf Request_URI ^/manual/ko/ prefer-language=ko - SetEnvIf Request_URI ^/manual/ru/ prefer-language=ru - RedirectMatch 301 ^/manual(?:/(de|en|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2 </Directory> |