- release 9,

- added EAPI support and mod_defines,
- added apxs patch (from rawhide),
- added default config files set in separated Sources#.

Changed files:
    apache.spec -> 1.55

diff --git a/apache.spec b/apache.spec
index c7f8534b40eef68f6d5a482c347430207dc28ccd..c62db7901a74fa7eaed684cfeb657c7ef79d3de3 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -1,25 +1,30 @@
-Summary:       HTTP server daemon to provide WWW services with IPv6 support
+Summary:       The most widely used Web server on the Internet
 Summary(de):   Leading World Wide Web-Server
-Summary(fr):   Serveur Web leader du marché
+Summary(fr):   Le serveur web le plus utilise sur Internet
 Summary(pl):   Serwer WWW (World Wide Web) ze wsparciem dla IPv6
 Summary(tr):   Lider WWW tarayýcý
 Name:          apache
 Version:       1.3.9
-Release:       5
+Release:       9
 Group:         Networking/Daemons
 Group(pl):     Sieciowe/Serwery
 Source0:       ftp://ftp.apache.org/apache/dist/%{name}_%{version}.tar.gz
 Source1:       apache.init
 Source2:       apache.logrotate
-Source3:       apache-extra1.tar.bz2
-Source8:       apache.sysconfig
+Source3:       apache-icons.tar.gz
+Source4:       apache.sysconfig
+Source5:       apache-access.conf
+Source6:       apache-httpd.conf
+Source7:       apache-srm.conf
+Source8:       apache-virtual-host.conf
 Patch0:                apache-suexec.patch
-Patch1:                ftp://ftp.kame.net/pub/kame/misc/apache-139-v6-19991013a.diff.gz
-Patch2:                ftp://ftp.nemoto.ecei.tohoku.ac.jp/pub/Net/IPv6/Patches/apache-139-v6-19991013a.new4.patch.gz
-Patch3:                ftp://ftp.nemoto.ecei.tohoku.ac.jp/pub/Net/IPv6/Patches/apache-139-v6-19991013a.new4_to_4.1.patch
-Patch4:                apache-htdocs.patch
-Patch5:                apache-release.patch
-Patch6:                apache-pld.patch
+Patch1:                apache-1.3.9-ipv6-23081999.patch.gz
+Patch2:                apache-htdocs.patch
+Patch3:                apache-release.patch
+Patch4:                apache-pld.patch
+Patch5:                apache-EAPI.patch
+Patch6:                apache-errordocs.patch
+Patch7:                apache-apxs.patch
 Copyright:     BSD-like
 Provides:      httpd
 Provides:      webserver
@@ -28,7 +33,9 @@ Prereq:               /usr/sbin/useradd
 Prereq:                /usr/bin/getgid
 Prereq:                /usr/bin/id
 Prereq:                sh-utils
+BuildRequires: mm-devel
 Requires:      rc-scripts
+Requires:      mailcap
 URL:           http://www.apache.org/
 BuildRoot:     /tmp/%{name}-%{version}-root
 Obsoletes:     apache-extra
@@ -40,16 +47,29 @@ Obsoletes:  apache6
 %define                _libexecdir     %{_prefix}/lib/apache
 
 %description
-Apache is a full featured web server that is freely available, and also
-happens to be the most widely used. This version supports IPv6.
+Apache is a powerful, full-featured, efficient and freely-available Web
+server. Apache is also the most popular Web server on the Internet.
+
+This special version also includes many optimizations, Extended Application
+Programming Interface (EAPI), Shared memory module, Hotwired XSSI module,
+hooks for SSL module and several cosmetic improvements. Also included is the
+FrontPage 2000 patch, however you need to install the frontpage package to
+enable it.
 
 %description -l de
 Apache ist ein voll funktionsfähiger Web-Server, der kostenlos
 erhältlich und weit verbreitet ist.
 
 %description -l fr
-Apache est un serveur Web complet, disponible librement, et se trouve être
-aussi le plus utilisé à travers le monde.
+Apache est un serveur Web puissant, efficace, gratuit et complet. Apache est
+aussi le serveur Web le plus populaire sur Internet.
+
+Cette version speciale inclut egalement plusieurs optimisations, l'Interface
+de Programmation d'Applications Etendu (EAPI), le module de memoire
+partagee, un module XSSI de Hotwired , des attaches pour le module SSL ainsi
+que plusieurs ameliorations cosmetiques. La patch FrontPage 2000 est
+egalement incluse, toutefois vous devrez installer le package additionnel
+frontpage pour utiliser ces fonctions.
 
 %description -l pl
 Apache jest serwerem WWW (World Wide Web). Instaluj±c ten pakiet bêdziesz 
@@ -78,14 +98,22 @@ UID ni
 jako taki sam u¿ytkownik jak serwer WWW.
 
 %package devel
-Summary:       Apache include files
-Summary(pl):   Pliki nag³ówkowe do serwera www Apache
+Summary:       Module development tools for the Apache web server
+Summary(fr):   Les outils de developpement de modules pour le serveur web Apache
+Summary(pl):   Pliki nag³ówkowe do tworzenai modu³ów rozszerzeñ do serwera www Apache
 Group:         Networking/Development
 Group(pl):     Sieciowe/Programowanie
 Requires:      %{name} = %{version}
 
 %description devel
-Apache include files.
+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.
+
+%description -l fr devel
+Le package apache-devel contient le code source pour le serveur Web Apache
+et le binaire APXS dont vous aurez besoin pour construire des Objets
+Dynamiques Partages (DSOs) pour Apache.
 
 %description -l pl devel
 Pliki nag³ówkowe dla serwera WWW Apache.
@@ -104,7 +132,7 @@ Documentation for apache in HTML format.
 Dokumentacja do Apache w formacie HTML.
 
 %prep 
-%setup -q -n apache_%{version} -a3
+%setup -q -n apache_%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -112,9 +140,13 @@ Dokumentacja do Apache w formacie HTML.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
-OPTIM="$RPM_OPT_FLAGS" LDFLAGS="-s" \
+
+LDFLAGS="-s"
+export LDFLAGS
+OPTIM="$RPM_OPT_FLAGS" \
 ./configure \
        --prefix=%{_prefix} \
        --sysconfdir=%{_sysconfdir} \
@@ -136,6 +168,7 @@ OPTIM="$RPM_OPT_FLAGS" LDFLAGS="-s" \
        --suexec-uidmin=500 \
        --suexec-gidmin=500 \
        --enable-rule=INET6 \
+       --enable-rule=EAPI \
        --disable-rule=WANTHSREGEX
 make
 
@@ -147,6 +180,7 @@ make install-quiet root="$RPM_BUILD_ROOT"
 #mv $RPM_BUILD_ROOT%{_datadir}/htdocs $RPM_BUILD_ROOT%{_datadir}/html
 
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
+       $RPM_BUILD_ROOT%{_datadir}/errordocs \
        $RPM_BUILD_ROOT/var/log/httpd
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache
@@ -157,15 +191,17 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/*
 
 touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer}_log
 
-cp -a apache-extra/errordocs   $RPM_BUILD_ROOT%{_datadir}/
-cp -a apache-extra/icons/*     $RPM_BUILD_ROOT%{_datadir}/icons
-cp -a apache-extra/*.conf      $RPM_BUILD_ROOT%{_sysconfdir}
-cp -a apache-extra/m*          $RPM_BUILD_ROOT%{_sysconfdir}
+install errordocs/* $RPM_BUILD_ROOT%{_datadir}/errordocs
+
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/access.conf
+install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/srm.conf
+install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/virtual-host.conf
 
-strip $RPM_BUILD_ROOT%{_libexecdir}/* || :
+strip --strip-unneeded $RPM_BUILD_ROOT%{_libexecdir}/*.so
 
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/* \
-       ABOUT_APACHE src/CHANGES KEYS README README.v6
+       ABOUT_APACHE src/CHANGES KEYS README README.v6 README.EAPI
 
 %pre
 if [ -n "`getgid http`" ]; then