- manually updated mod_ssl-eapi patch (there is no new mod_ssl yet)

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index ca3f92ef5e92f4ea292d13d224c8951b47f8c417..c060465514e00a9a518bdd6b1962bcd538057946 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
-# mod_rewrite_ldap - enable ldap map supoort for mod_rewrite (alpha)
-# _without_apache_ipv6 - disable IPv6 support
+# mod_rewrite_ldap     - enable ldap map supoort for mod_rewrite (alpha)
+# _without_ipv6                - disable IPv6 support
 #
 %include       /usr/lib/rpm/macros.perl
 Summary:       The most widely used Web server on the Internet
@@ -26,8 +26,8 @@ Summary(tr):  Lider WWW taray
 Summary(uk):   îÁÊÐÏÐÕÌÑÒΦÛÉÊ Web-Server
 Summary(zh_CN):        Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
 Name:          apache
-Version:       1.3.23
-Release:       3
+Version:       1.3.26
+Release:       1
 License:       Apache Group License
 Group:         Networking/Daemons
 URL:           http://www.apache.org/
@@ -250,7 +250,7 @@ Summary(uk):        
 Summary(zh_CN):        ÓÃÓÚ Apache Web ·þÎñ³ÌÐòµÄ¿ª·¢¹¤¾ß¡£
 Group:         Networking/Utilities
 Requires:      %{name}(EAPI) = %{version}
-Provides:      %{name}(EAPI)-devel
+Provides:      %{name}(EAPI)-devel = %{version}
 
 %description devel
 The apache-devel package contains header files for Apache.
@@ -381,7 +381,7 @@ Ten pakiet zawiera modu
 ale jako plików danych u¿ywa Berkeley DB.
 
 %package mod_auth_digest
-Summary:       Apache user authentication module using MD5 Digest Authentication 
+Summary:       Apache user authentication module using MD5 Digest Authentication
 Summary(pl):   Modu³ apache do autoryzacji MD5
 Group:         Networking/Daemons
 Prereq:                %{_sbindir}/apxs
@@ -413,7 +413,7 @@ variables which can be expanded on any(!) directive line.
 Modu³ ten umo¿liwia definicjê zmiennych i dyrektyw.
 
 %package mod_digest
-Summary:       Older version of apache user authentication module using MD5 Digest Authentication 
+Summary:       Older version of apache user authentication module using MD5 Digest Authentication
 Summary(pl):   Starsza wersja modu³u apache do autoryzacji MD5
 Group:         Networking/Daemons
 Prereq:                %{_sbindir}/apxs
@@ -423,9 +423,10 @@ Requires:  %{name}(EAPI) = %{version}
 %description mod_digest
 This package contains mod_digest module. It provides user
 authentication using MD5 Digest Authentication. It implements an older
-version of the MD5 Digest Authentication specification which will probably
-not work with modern browsers. Please take a look at mod_auth_digest
-which implements the most recent version of the standard.
+version of the MD5 Digest Authentication specification which will
+probably not work with modern browsers. Please take a look at
+mod_auth_digest which implements the most recent version of the
+standard.
 
 %description mod_digest -l pl
 Modu³ ten dostarcza metodê autoryzacji bazuj±c± na MD5 Digest
@@ -654,7 +655,7 @@ wa
 %patch6 -p0
 %patch7 -p1
 %patch8 -p1
-%{!?_without_apache_ipv6:%patch9 -p1}
+%{!?_without_ipv6:%patch9 -p1}
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
@@ -664,7 +665,7 @@ wa
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
-%{?_without_apache_ipv6:%patch19 -p1}
+%{?_without_ipv6:%patch19 -p1}
 %patch20 -p1
 %patch21 -p1
 
@@ -695,7 +696,7 @@ OPTIM="%{rpmcflags}" \
        --suexec-docroot=%{_datadir} \
        --disable-rule=WANTHSREGEX \
        --enable-rule=EAPI \
-       %{!?_without_apache_ipv6:--enable-rule=INET6}
+       %{!?_without_ipv6:--enable-rule=INET6}
 
 %{__make} LIBS1="-lm -lcrypt -lmm -ldl"
 
@@ -732,8 +733,6 @@ install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/mod_proxy.conf
 
 ln -sf index.html.en $RPM_BUILD_ROOT%{_datadir}/html/index.html
 
-gzip -9nf ABOUT_APACHE src/CHANGES README
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -744,6 +743,7 @@ if [ -n "`getgid http`" ]; then
                exit 1
        fi
 else
+       echo "Adding group http GID=51"
        /usr/sbin/groupadd -g 51 -r -f http
 fi
 if [ -n "`id -u http 2>/dev/null`" ]; then
@@ -752,6 +752,7 @@ if [ -n "`id -u http 2>/dev/null`" ]; then
                exit 1
        fi
 else
+       echo "Adding user http UID=51"
        /usr/sbin/useradd -u 51 -r -d /home/httpd -s /bin/false -c "HTTP User" -g http http 1>&2
 fi
 
@@ -809,7 +810,9 @@ fi
 
 %postun
 if [ "$1" = "0" ]; then
+       echo "Removing user http UID=51"
        /usr/sbin/userdel http
+       echo "Removing group http GID=51"
        /usr/sbin/groupdel http
 fi
 
@@ -893,7 +896,7 @@ if [ "$1" = "0" ]; then
        fi
 fi
 
-%triggerpostun mod_auth_db -- apache-mod_auth_db <= 1.3.20-2 
+%triggerpostun mod_auth_db -- apache-mod_auth_db <= 1.3.20-2
 %{_sbindir}/apxs -e -A -n auth_dbm %{_libexecdir}/mod_auth_dbm.so 1>&2
 
 %post mod_define
@@ -1038,7 +1041,7 @@ fi
 %preun mod_proxy
 if [ "$1" = "0" ]; then
        %{_sbindir}/apxs -e -A -n proxy %{_libexecdir}/libproxy.so 1>&2
-       grep -v -q "^Include.*mod_proxy.conf" /etc/httpd/httpd.conf > \
+       grep -v "^Include.*mod_proxy.conf" /etc/httpd/httpd.conf > \
                /etc/httpd/httpd.conf.tmp
        mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
        if [ -f /var/lock/subsys/httpd ]; then
@@ -1076,7 +1079,7 @@ fi
 %preun mod_status
 if [ "$1" = "0" ]; then
        %{_sbindir}/apxs -e -A -n status %{_libexecdir}/mod_status.so 1>&2
-       grep -v -q "^Include.*mod_status.conf" /etc/httpd/httpd.conf > \
+       grep -v "^Include.*mod_status.conf" /etc/httpd/httpd.conf > \
                /etc/httpd/httpd.conf.tmp
        mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
        if [ -f /var/lock/subsys/httpd ]; then
@@ -1130,7 +1133,7 @@ fi
 %preun mod_vhost_alias
 if [ "$1" = "0" ]; then
        %{_sbindir}/apxs -e -A -n vhost_alias %{_libexecdir}/mod_vhost_alias.so 1>&2
-       grep -v -q "^Include.*mod_vhost_alias.conf" /etc/httpd/httpd.conf > \
+       grep -v "^Include.*mod_vhost_alias.conf" /etc/httpd/httpd.conf > \
                /etc/httpd/httpd.conf.tmp
        mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
        if [ -f /var/lock/subsys/httpd ]; then
@@ -1140,7 +1143,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc ABOUT_APACHE.gz src/CHANGES.gz README.gz
+%doc ABOUT_APACHE src/CHANGES README
 %doc conf/mime.types
 
 %attr(754,root,root) /etc/rc.d/init.d/httpd
@@ -1206,138 +1209,163 @@ fi
 %attr(755,root,root) %{_datadir}/manual/search/manual-index.cgi
 %{_datadir}/manual/LICENSE
 %{_datadir}/manual/bind.html.html
-%lang(en) %{_datadir}/manual/bind.html.en
+%{_datadir}/manual/bind.html.en
 %lang(fr) %{_datadir}/manual/bind.html.fr
+%lang(ja) %{_datadir}/manual/bind.html.ja.jis
 %{_datadir}/manual/cgi_path.html.html
-%lang(en) %{_datadir}/manual/cgi_path.html.en
+%{_datadir}/manual/cgi_path.html.en
 %lang(fr) %{_datadir}/manual/cgi_path.html.fr
+%lang(ja) %{_datadir}/manual/cgi_path.html.ja.jis
 %{_datadir}/manual/configuring.html.html
-%lang(en) %{_datadir}/manual/configuring.html.en
+%{_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/custom-error.html.html
-%lang(en) %{_datadir}/manual/custom-error.html.en
+%{_datadir}/manual/custom-error.html.en
 %lang(fr) %{_datadir}/manual/custom-error.html.fr
 %lang(ja) %{_datadir}/manual/custom-error.html.ja.jis
 %{_datadir}/manual/dns-caveats.html.html
-%lang(en) %{_datadir}/manual/dns-caveats.html.en
+%{_datadir}/manual/dns-caveats.html.en
 %lang(fr) %{_datadir}/manual/dns-caveats.html.fr
 %{_datadir}/manual/dso.html
 %{_datadir}/manual/env.html.html
-%lang(en) %{_datadir}/manual/env.html.en
+%{_datadir}/manual/env.html.en
 %lang(ja) %{_datadir}/manual/env.html.ja.jis
 %{_datadir}/manual/footer.html
 %{_datadir}/manual/handler.html.html
-%lang(en) %{_datadir}/manual/handler.html.en
+%{_datadir}/manual/handler.html.en
 %lang(ja) %{_datadir}/manual/handler.html.ja.jis
 %{_datadir}/manual/header.html
 %{_datadir}/manual/index.html.html
-%lang(en) %{_datadir}/manual/index.html.en
+%{_datadir}/manual/index.html.en
 %lang(fr) %{_datadir}/manual/index.html.fr
 %lang(ja) %{_datadir}/manual/index.html.ja.jis
 %{_datadir}/manual/install.html.html
-%lang(en) %{_datadir}/manual/install.html.en
+%{_datadir}/manual/install.html.en
 %lang(es) %{_datadir}/manual/install.html.es
 %lang(fr) %{_datadir}/manual/install.html.fr
 %lang(ja) %{_datadir}/manual/install.html.ja.jis
 %{_datadir}/manual/invoking.html.html
-%lang(en) %{_datadir}/manual/invoking.html.en
+%{_datadir}/manual/invoking.html.en
 %lang(fr) %{_datadir}/manual/invoking.html.fr
 %{_datadir}/manual/keepalive.html.html
-%lang(en) %{_datadir}/manual/keepalive.html.en
+%{_datadir}/manual/keepalive.html.en
 %lang(ja) %{_datadir}/manual/keepalive.html.ja.jis
 %{_datadir}/manual/location.html
 %{_datadir}/manual/logs.html
 %{_datadir}/manual/multilogs.html
 %{_datadir}/manual/new_features_1_3.html.html
-%lang(en) %{_datadir}/manual/new_features_1_3.html.en
+%{_datadir}/manual/new_features_1_3.html.en
 %lang(ja) %{_datadir}/manual/new_features_1_3.html.ja.jis
-%{_datadir}/manual/process-model.html
-%{_datadir}/manual/sections.html
+%{_datadir}/manual/process-model.html.html
+%{_datadir}/manual/process-model.html.en
+%lang(ja) %{_datadir}/manual/process-model.html.ja.jis
+%{_datadir}/manual/sections.html.html
+%{_datadir}/manual/sections.html.en
+%lang(ja) %{_datadir}/manual/sections.html.ja.jis
 %{_datadir}/manual/server-wide.html.html
-%lang(en) %{_datadir}/manual/server-wide.html.en
+%{_datadir}/manual/server-wide.html.en
 %lang(fr) %{_datadir}/manual/server-wide.html.fr
 %lang(ja) %{_datadir}/manual/server-wide.html.ja.jis
 %{_datadir}/manual/sitemap.html
 %{_datadir}/manual/sourcereorg.html
 %{_datadir}/manual/stopping.html.html
-%lang(en) %{_datadir}/manual/stopping.html.en
+%{_datadir}/manual/stopping.html.en
 %lang(fr) %{_datadir}/manual/stopping.html.fr
 %{_datadir}/manual/upgrading_to_1_3.html
 %{_datadir}/manual/urlmapping.html
 %dir %{_datadir}/manual/howto
 %{_datadir}/manual/howto/cgi.html.html
-%lang(en) %{_datadir}/manual/howto/cgi.html.en
+%{_datadir}/manual/howto/cgi.html.en
 %lang(ja) %{_datadir}/manual/howto/cgi.html.ja.jis
 %{_datadir}/manual/howto/footer.html
 %{_datadir}/manual/howto/header.html
 %{_datadir}/manual/howto/ssi.html.html
-%lang(en) %{_datadir}/manual/howto/ssi.html.en
+%{_datadir}/manual/howto/ssi.html.en
 %lang(ja) %{_datadir}/manual/howto/ssi.html.ja.jis
 %dir %{_datadir}/manual/mod
 %{_datadir}/manual/mod/core.html.html
-%lang(en) %{_datadir}/manual/mod/core.html.en
+%{_datadir}/manual/mod/core.html.en
 %lang(fr) %{_datadir}/manual/mod/core.html.fr
 %{_datadir}/manual/mod/directive-dict.html.html
-%lang(en) %{_datadir}/manual/mod/directive-dict.html.en
+%{_datadir}/manual/mod/directive-dict.html.en
 %lang(fr) %{_datadir}/manual/mod/directive-dict.html.fr
 %lang(ja) %{_datadir}/manual/mod/directive-dict.html.ja.jis
 %{_datadir}/manual/mod/directives.html.html
 %lang(de) %{_datadir}/manual/mod/directives.html.de
-%lang(en) %{_datadir}/manual/mod/directives.html.en
+%{_datadir}/manual/mod/directives.html.en
 %lang(fr) %{_datadir}/manual/mod/directives.html.fr
 %lang(ja) %{_datadir}/manual/mod/directives.html.ja.jis
 %{_datadir}/manual/mod/footer.html
 %{_datadir}/manual/mod/header.html
 %{_datadir}/manual/mod/index-bytype.html.html
-%lang(en) %{_datadir}/manual/mod/index-bytype.html.en
+%{_datadir}/manual/mod/index-bytype.html.en
 %lang(fr) %{_datadir}/manual/mod/index-bytype.html.fr
+%lang(ja) %{_datadir}/manual/mod/index-bytype.html.ja.jis
 %{_datadir}/manual/mod/index.html.html
-%lang(en) %{_datadir}/manual/mod/index.html.en
+%{_datadir}/manual/mod/index.html.en
 %lang(fr) %{_datadir}/manual/mod/index.html.fr
 %lang(ja) %{_datadir}/manual/mod/index.html.ja.jis
-%{_datadir}/manual/mod/mod_access.html
+%{_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
-%{_datadir}/manual/mod/mod_asis.html
+%{_datadir}/manual/mod/mod_asis.html.html
+%{_datadir}/manual/mod/mod_asis.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_asis.html.ja.jis
 %{_datadir}/manual/mod/mod_autoindex.html
-%{_datadir}/manual/mod/mod_cgi.html
 %{_datadir}/manual/mod/mod_cern_meta.html
+%{_datadir}/manual/mod/mod_cgi.html.html
+%{_datadir}/manual/mod/mod_cgi.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_cgi.html.ja.jis
 %{_datadir}/manual/mod/mod_env.html.html
-%lang(en) %{_datadir}/manual/mod/mod_env.html.en
+%{_datadir}/manual/mod/mod_env.html.en
 %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_referer.html
 %{_datadir}/manual/mod/mod_mime.html.html
-%lang(en) %{_datadir}/manual/mod/mod_mime.html.en
+%{_datadir}/manual/mod/mod_mime.html.en
 %lang(ja) %{_datadir}/manual/mod/mod_mime.html.ja.jis
 %{_datadir}/manual/mod/mod_mime_magic.html
 %{_datadir}/manual/mod/mod_negotiation.html.html
-%lang(en) %{_datadir}/manual/mod/mod_negotiation.html.en
+%{_datadir}/manual/mod/mod_negotiation.html.en
 %lang(ja) %{_datadir}/manual/mod/mod_negotiation.html.ja.jis
 %{_datadir}/manual/mod/mod_setenvif.html.html
-%lang(en) %{_datadir}/manual/mod/mod_setenvif.html.en
+%{_datadir}/manual/mod/mod_setenvif.html.en
 %lang(ja) %{_datadir}/manual/mod/mod_setenvif.html.ja.jis
-%{_datadir}/manual/mod/mod_so.html
-%{_datadir}/manual/mod/mod_speling.html
-%{_datadir}/manual/mod/mod_userdir.html
+%{_datadir}/manual/mod/mod_so.html.html
+%{_datadir}/manual/mod/mod_so.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_so.html.ja.jis
+%{_datadir}/manual/mod/mod_speling.html.html
+%{_datadir}/manual/mod/mod_speling.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_speling.html.ja.jis
+%{_datadir}/manual/mod/mod_userdir.html.html
+%{_datadir}/manual/mod/mod_userdir.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_userdir.html.ja.jis
 %{_datadir}/manual/mod/module-dict.html.html
-%lang(en) %{_datadir}/manual/mod/module-dict.html.en
+%{_datadir}/manual/mod/module-dict.html.en
 %lang(ja) %{_datadir}/manual/mod/module-dict.html.ja.jis
 %dir %{_datadir}/manual/programs
 %{_datadir}/manual/programs/ab.html
-%{_datadir}/manual/programs/apachectl.html
+%{_datadir}/manual/programs/apachectl.html.html
+%{_datadir}/manual/programs/apachectl.html.en
+%lang(ja) %{_datadir}/manual/programs/apachectl.html.ja.jis
 %{_datadir}/manual/programs/apxs.html
 %{_datadir}/manual/programs/dbmmanage.html
 %{_datadir}/manual/programs/footer.html
 %{_datadir}/manual/programs/header.html
 %{_datadir}/manual/programs/htdigest.html
-%{_datadir}/manual/programs/htpasswd.html
-%{_datadir}/manual/programs/httpd.html
+%{_datadir}/manual/programs/htpasswd.html.html
+%{_datadir}/manual/programs/htpasswd.html.en
+%lang(ja) %{_datadir}/manual/programs/htpasswd.html.ja.jis
+%{_datadir}/manual/programs/httpd.html.html
+%{_datadir}/manual/programs/httpd.html.en
+%lang(ja) %{_datadir}/manual/programs/httpd.html.ja.jis
 %{_datadir}/manual/programs/index.html.html
-%lang(en) %{_datadir}/manual/programs/index.html.en
+%{_datadir}/manual/programs/index.html.en
 %lang(ja) %{_datadir}/manual/programs/index.html.ja.jis
 %{_datadir}/manual/programs/logresolve.html
 %{_datadir}/manual/programs/other.html
@@ -1345,17 +1373,19 @@ fi
 %dir %{_datadir}/manual/vhosts
 %{_datadir}/manual/vhosts/details.html
 %{_datadir}/manual/vhosts/examples.html
-%{_datadir}/manual/vhosts/fd-limits.html
+%{_datadir}/manual/vhosts/fd-limits.html.html
+%{_datadir}/manual/vhosts/fd-limits.html.en
+%lang(ja) %{_datadir}/manual/vhosts/fd-limits.html.ja.jis
 %{_datadir}/manual/vhosts/footer.html
 %{_datadir}/manual/vhosts/header.html
 %{_datadir}/manual/vhosts/host.html
 %{_datadir}/manual/vhosts/index.html.html
-%lang(en) %{_datadir}/manual/vhosts/index.html.en
+%{_datadir}/manual/vhosts/index.html.en
 %lang(ja) %{_datadir}/manual/vhosts/index.html.ja.jis
 %{_datadir}/manual/vhosts/ip-based.html
 %{_datadir}/manual/vhosts/mass.html
 %{_datadir}/manual/vhosts/name-based.html.html
-%lang(en) %{_datadir}/manual/vhosts/name-based.html.en
+%{_datadir}/manual/vhosts/name-based.html.en
 %lang(ja) %{_datadir}/manual/vhosts/name-based.html.ja.jis
 %{_datadir}/manual/vhosts/vhosts-in-depth.html
 %{_datadir}/manual/vhosts/virtual-host.html
@@ -1376,12 +1406,12 @@ fi
 %lang(it) %{_datadir}/html/index.html.it
 %lang(ja) %{_datadir}/html/index.html.ja.jis
 %lang(ko) %{_datadir}/html/index.html.kr.iso-kr
-%lang(de_LU) %{_datadir}/html/index.html.lu
+%lang(de_LU) %{_datadir}/html/index.html.lb.utf8
 %lang(nl) %{_datadir}/html/index.html.nl
 %lang(nn) %{_datadir}/html/index.html.nn
 %lang(no) %{_datadir}/html/index.html.no
 %lang(pl) %{_datadir}/html/index.html.po.iso-pl
-%lang(pt_PT) %{_datadir}/html/index.html.pt
+%lang(pt) %{_datadir}/html/index.html.pt
 %lang(pt_BR) %{_datadir}/html/index.html.pt-br
 %lang(ru) %{_datadir}/html/index.html.ru.cp-1251
 %lang(ru) %{_datadir}/html/index.html.ru.cp866
@@ -1390,8 +1420,8 @@ fi
 %lang(ru) %{_datadir}/html/index.html.ru.ucs2
 %lang(ru) %{_datadir}/html/index.html.ru.ucs4
 %lang(ru) %{_datadir}/html/index.html.ru.utf8
-%lang(se) %{_datadir}/html/index.html.se
-%lang(zh_TW) %{_datadir}/html/index.html.zh.Big5
+%lang(sv) %{_datadir}/html/index.html.se
+%lang(zh_TW) %{_datadir}/html/index.html.zh
 
 %{_datadir}/html/*.gif
 %{_datadir}/errordocs
@@ -1405,9 +1435,11 @@ fi
 %defattr(644,root,root,755)
 %attr(4755,root,root) %{_sbindir}/suexec
 %{_datadir}/manual/suexec.html.html
-%lang(en) %{_datadir}/manual/suexec.html.en
+%{_datadir}/manual/suexec.html.en
 %lang(ja) %{_datadir}/manual/suexec.html.ja.jis
-%{_datadir}/manual/programs/suexec.html
+%{_datadir}/manual/programs/suexec.html.html
+%{_datadir}/manual/programs/suexec.html.en
+%lang(ja) %{_datadir}/manual/programs/suexec.html.ja.jis
 
 %files devel
 %defattr(644,root,root,755)
@@ -1416,7 +1448,9 @@ fi
 %files mod_actions
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mod_actions.so
-%{_datadir}/manual/mod/mod_actions.html
+%{_datadir}/manual/mod/mod_actions.html.html
+%{_datadir}/manual/mod/mod_actions.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_actions.html.ja.jis
 
 %files mod_auth
 %defattr(644,root,root,755)
@@ -1456,7 +1490,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mod_dir.so
 %{_datadir}/manual/mod/mod_dir.html.html
-%lang(en) %{_datadir}/manual/mod/mod_dir.html.en
+%{_datadir}/manual/mod/mod_dir.html.en
 %lang(ja) %{_datadir}/manual/mod/mod_dir.html.ja.jis
 
 %files mod_expires
@@ -1482,7 +1516,9 @@ fi
 %files mod_info
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mod_info.so
-%{_datadir}/manual/mod/mod_info.html
+%{_datadir}/manual/mod/mod_info.html.html
+%{_datadir}/manual/mod/mod_info.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_info.html.ja.jis
 
 %files mod_proxy
 %defattr(644,root,root,755)
@@ -1512,7 +1548,9 @@ fi
 %files mod_unique_id
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mod_unique_id.so
-%{_datadir}/manual/mod/mod_unique_id.html
+%{_datadir}/manual/mod/mod_unique_id.html.html
+%{_datadir}/manual/mod/mod_unique_id.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_unique_id.html.ja.jis
 
 %files mod_vhost_alias
 %defattr(644,root,root,755)