- manual/howto/ssi.html is localized now

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index 5b6c9a18faddf09d2555063fd3d6d0df45e68ed4..5ed6cf940d28eeee9e5d50747e84ff67ba21a4dd 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -10,8 +10,8 @@ Summary(fr):  Le serveur web le plus utilise sur Internet
 Summary(pl):   Serwer WWW (World Wide Web)
 Summary(tr):   Lider WWW tarayýcý
 Name:          apache
-Version:       1.3.17
-Release:       2
+Version:       1.3.19
+Release:       6
 License:       Apache Group License
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
@@ -35,7 +35,7 @@ Patch5:               %{name}-mod_ssl-addon.patch
 Patch6:                %{name}-mod_ssl-eapi.patch
 Patch7:                %{name}-EAPI_MM_CORE_PATH-correction.patch
 Patch8:                %{name}-EAPI_MM=SYSTEM.patch
-Patch9:                %{name}-v6-PLD-5.patch.gz
+Patch9:                %{name}-v6-PLD-7.patch.gz
 Patch10:       %{name}-modules_symbols.patch
 Patch11:       %{name}-apxs_force_rm_cp.patch
 Patch12:       %{name}-db3.patch
@@ -46,6 +46,7 @@ Patch16:      %{name}-buff.patch
 Patch17:       %{name}-mkstemp.patch
 Patch18:       %{name}-EAPI-missing_files.patch
 Patch19:       %{name}-mod_include-segv.patch
+Patch20:       %{name}-PLD-nov6.patch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires:  db3-devel
 BuildRequires: mm-devel >= 1.1.3
@@ -63,6 +64,7 @@ Prereq:               mm
 Prereq:                perl
 Requires:      mailcap
 Requires:      /etc/mime.types
+Requires:      psmisc >= 20.1
 Obsoletes:     apache-extra
 Obsoletes:     apache6
 Obsoletes:     apache-doc
@@ -125,9 +127,7 @@ Requires:   %{name}(EAPI) = %{version}
 Provides:      %{name}(EAPI)-devel
 
 %description devel
-The apache-devel package contains the source code for the Apache Web
-server and the APXS binary you'll need to build Dynamic Shared Objects
-(DSOs) for Apache.
+The apache-devel package contains header files for Apache.
 
 %description -l fr devel
 Le package apache-devel contient le code source pour le serveur Web
@@ -444,6 +444,7 @@ wirtualnych.
 
 %package mod_unique_id
 Summary:       Apache module which provides a magic token for each request
+Summary(pl):   Modu³ nadaj±cy ka¿demu ¿±daniu unikalny token
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
@@ -460,8 +461,15 @@ machines. The environment variable UNIQUE_ID is set to the identifier
 for each request. Unique identifiers are useful for various reasons
 which are beyond the scope of this document.
 
+%description -l pl mod_unique_id
+Modu³ nadaje przy ka¿dym ¿±daniu token unikalny w ramach wszystkich
+¿±dañ, nawet w ramach poprawnie skonfigurowanego klastra z wielu
+maszyn. Modu³ ustawia przy ka¿dym ¿±daniu zmienn± ¶rodowiskow±
+UNIQUE_ID.
+
 %package mod_expires
-Summary:       Apache module which provides .... 
+Summary:       Apache module which generates Expires HTTP headers
+Summary(pl):   Modu³ generuj±cy nag³ówki HTTP Expires
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
@@ -470,6 +478,14 @@ Prereq:            perl
 Requires:      %{name}(EAPI) = %{version}
 
 %description mod_expires
+This module controls the setting of the Expires HTTP header in server
+responses. The expiration date can set to be relative to either the time
+the source file was last modified, or to the time of the client access.
+
+%description -l pl mod_expires
+Modu³ kontroluje ustawianie nag³ówka HTTP Expires. Data wyga¶niêcia
+wa¿no¶ci mo¿e byæ ustalana w zale¿no¶ci od czasu modyfikacji plików
+¼ród³owych lub odwo³ania klienta.
 
 %prep 
 %setup -q -n apache_%{version} -a3
@@ -493,9 +509,9 @@ Requires:   %{name}(EAPI) = %{version}
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-
+%{?bcond_off_apache_ipv6:%patch20 -p1}
 %build
-OPTIM="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS}" \
+OPTIM="%{rpmcflags}" \
 ./configure \
        --prefix=%{_prefix} \
        --sysconfdir=%{_sysconfdir} \
@@ -536,7 +552,7 @@ rm -f src/modules/standard/mod_rewrite.so
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
        $RPM_BUILD_ROOT%{_datadir}/errordocs \
-       $RPM_BUILD_ROOT/var/{log/{httpd,archiv/httpd},{lib,run}/apache}
+       $RPM_BUILD_ROOT/var/{log/{httpd,archiv/httpd},run/apache}
 
 %{__make} install-quiet root="$RPM_BUILD_ROOT"
 
@@ -563,7 +579,7 @@ gzip -9nf ABOUT_APACHE src/CHANGES KEYS README
 %pre
 if [ -n "`getgid http`" ]; then
        if [ "`getgid http`" != "51" ]; then
-               echo "Warning:group http haven't gid=51. Corect this before install apache" 1>&2
+               echo "Warning: group http haven't gid=51. Correct this before installing apache" 1>&2
                exit 1
        fi
 else
@@ -571,7 +587,7 @@ else
 fi
 if [ -n "`id -u http 2>/dev/null`" ]; then
        if [ "`id -u http`" != "51" ]; then
-               echo "Warning:user http haven't uid=51. Corect this before install apache" 1>&2
+               echo "Warning: user http haven't uid=51. Correct this before installing apache" 1>&2
                exit 1
        fi
 else
@@ -989,7 +1005,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/logresolve
 %attr(755,root,root) %{_sbindir}/rotatelogs
 
-%dir %attr(770,root,http) /var/lib/apache
 %dir %attr(770,root,http) /var/run/apache
 
 %{_mandir}/man1/htdigest.1*
@@ -1046,7 +1061,8 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ja) %{_datadir}/manual/howto/cgi.html.ja.jis
 %{_datadir}/manual/howto/footer.html
 %{_datadir}/manual/howto/header.html
-%{_datadir}/manual/howto/ssi.html
+%lang(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
 %lang(en) %{_datadir}/manual/mod/directive-dict.html.en
@@ -1094,7 +1110,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/manual/vhosts/virtual-host.html
 
 %attr(755,root,root) %dir %{_datadir}/html
-%config(noreplace) %{_datadir}/html/index.html
+%config(noreplace,missingok) %{_datadir}/html/index.html
 # note: html extensions are not the same as (g)libc locale names
 %lang(ca) %{_datadir}/html/index.html.ca
 %lang(cs) %{_datadir}/html/index.html.cz