X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache.spec;h=c060465514e00a9a518bdd6b1962bcd538057946;hb=e57252ef2cd9213707599893f0a5f465899df65f;hp=bb75eef43a06ebd5d6cdc4d5d9ab683ac0ae5b43;hpb=640b4ad3e9af78f4cc4dbdef7307e1e9b781077a;p=packages%2Fapache.git diff --git a/apache.spec b/apache.spec index bb75eef..c060465 100644 --- 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: 6 +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. @@ -655,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 @@ -665,7 +665,7 @@ wa %patch16 -p1 %patch17 -p1 %patch18 -p1 -%{?_without_apache_ipv6:%patch19 -p1} +%{?_without_ipv6:%patch19 -p1} %patch20 -p1 %patch21 -p1 @@ -696,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" @@ -733,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 @@ -1145,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 @@ -1211,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 @@ -1350,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 @@ -1381,7 +1406,7 @@ 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 @@ -1396,7 +1421,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.Big5 +%lang(zh_TW) %{_datadir}/html/index.html.zh %{_datadir}/html/*.gif %{_datadir}/errordocs @@ -1410,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) @@ -1421,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) @@ -1461,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 @@ -1487,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) @@ -1517,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)