- TODO in spec

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index ae457cde6939a687ff395c90112e91fa69d18577..5cf24b201004c8638ef40b71c68629ffd5ecf0a5 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -1,12 +1,13 @@
-# TODO:
+# # TODO:
 # - config examples for mod_*
 # - --with-suexec-uidmin=500 or =1000 ?
 # - subpackages for MPMs
 # - !!!check if all modules (*.so) are exactly the same for different MPMs
 # - check those autn modules inner deps
 # - for external packages: don't use any apache module name in dep as they
-#   differ for apache 1.3/2.0/2.2!? any better ideas? rpm Suggests: tags?
-# - for mod_auth_* modules require each auth module to require virtual authn so at least *_default is chosen?
+#  differ for apache 1.3/2.0/2.2!? any better ideas? rpm Suggests: tags?
+# - for mod_auth_* modules require each auth module to require virtual authn so at least *_default
+#  is chosen?
 # - same for mod_authz
 # - mod_auth_digest and mod_auth_basic R: apache(authn) ?
 # - drop mod_case_filter* or find summary and description for them
@@ -24,6 +25,12 @@
 %include       /usr/lib/rpm/macros.perl
 # this is internal macro, don't change to %%apache_modules_api
 %define                _apache_modules_api 20051115
+
+%if "%{pld_release}" != "ac"
+%define                openssl_ver     0.9.8i
+%else
+%define                openssl_ver     0.9.7d
+%endif
 Summary:       The most widely used Web server on the Internet
 Summary(de.UTF-8):     Leading World Wide Web-Server
 Summary(es.UTF-8):     Servidor HTTPD para proveer servicios WWW
@@ -33,12 +40,12 @@ Summary(pt_BR.UTF-8):       Servidor HTTPD para prover serviços WWW
 Summary(ru.UTF-8):     Самый популярный веб-сервер
 Summary(tr.UTF-8):     Lider WWW tarayıcı
 Name:          apache
-Version:       2.2.11
-Release:       9
+Version:       2.2.14
+Release:       8
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: 03e0a99a5de0f3f568a0087fb9993af9
+# Source0-md5: 2c1e3c7ba00bcaa0163da7b3e66aaa1e
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -85,12 +92,10 @@ Patch15:    httpd-2.0.48-debuglog.patch
 Patch18:       %{name}-v6only-ENOPROTOOPT.patch
 Patch19:       %{name}-conffile-path.patch
 Patch20:       %{name}-apxs.patch
-# http://www.telana.com/peruser.php (2.2.3-0.3.0)
-Patch21:       httpd-peruser.patch
 Patch23:       %{name}-suexec_fcgi.patch
-Patch24:       %{name}-revert-bug-40463.patch
-Patch25:       %{name}-prefork-graceful-fix.patch
-Patch26:       %{name}-pollset-segv.patch
+Patch24:       %{name}-bug-48094.patch
+# http://marc.info/?l=apache-httpd-dev&m=125712658610440&w=2
+Patch25:       %{name}-shutdown-sockets.patch
 URL:           http://httpd.apache.org/
 BuildRequires: apr-devel >= 1:1.2
 BuildRequires: apr-util-devel >= 1:1.3
@@ -102,9 +107,10 @@ BuildRequires:     expat-devel
 BuildRequires: gdbm-devel >= 1.8.3
 BuildRequires: libtool >= 2:1.5
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
-%{?with_ssl:BuildRequires:     openssl-devel >= 0.9.7d}
-%{?with_ssl:BuildRequires:     openssl-tools >= 0.9.7d}
+%{?with_ssl:BuildRequires:     openssl-devel >= %{openssl_version}}
+%{?with_ssl:BuildRequires:     openssl-tools >= %{openssl_version}}
 BuildRequires: pcre-devel
+BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpm-build >= 4.4.0
 BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: rpmbuild(macros) >= 1.268
@@ -113,9 +119,7 @@ BuildRequires:      zlib-devel
 Requires:      %{name}-errordocs = %{version}-%{release}
 Requires:      %{name}-mod_alias = %{version}-%{release}
 Requires:      %{name}-mod_auth = %{version}-%{release}
-Requires:      %{name}-mod_cgi = %{version}-%{release}
 Requires:      %{name}-mod_env = %{version}-%{release}
-Requires:      %{name}-mod_include = %{version}-%{release}
 Requires:      %{name}-mod_log_config = %{version}-%{release}
 Requires:      %{name}-mod_mime = %{version}-%{release}
 Requires:      %{name}-mod_mime_magic = %{version}-%{release}
@@ -1378,6 +1382,7 @@ URL:              http://httpd.apache.org/docs/2.2/mod/mod_mime.html
 Requires:      %{name}-base = %{version}-%{release}
 Requires:      mailcap
 Provides:      apache(mod_mime) = %{version}-%{release}
+Provides:      webserver(mime)
 
 %description mod_mime
 This module is used to associate various bits of "meta information"
@@ -1531,6 +1536,10 @@ Epoch:           1
 Group:         Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.2/mod/mod_ssl.html
 Requires:      %{name}-base = %{version}-%{release}
+Requires:      openssl >= %{openssl_version}
+%if "%{pld_release}" != "ac"
+Requires:      apr-util-dbm-db
+%endif
 Provides:      apache(mod_ssl) = 1:%{version}-%{release}
 
 %description mod_ssl
@@ -1741,11 +1750,9 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
-%patch21 -p1
 %patch23 -p1
 %patch24 -p1
-%patch25 -p0
-%patch26 -p0
+%patch25 -p1
 
 # using system apr, apr-util and pcre
 rm -rf srclib/{apr,apr-util,pcre}
@@ -1779,7 +1786,7 @@ touch ssl_expr_scan.c
 cd ../..
 
 CPPFLAGS="-DMAX_SERVER_LIMIT=200000 -DBIG_SECURITY_HOLE=1"
-for mpm in prefork worker %{?with_peruser:peruser} %{?with_event:event}; do
+for mpm in prefork worker %{?with_event:event}; do
 install -d "buildmpm-${mpm}"; cd "buildmpm-${mpm}"
 ../%configure \
        --enable-layout=PLD \
@@ -1863,7 +1870,7 @@ cd ..
 
 done
 
-for mpm in %{?with_peruser:peruser} worker %{?with_event:event}; do
+for mpm in worker %{?with_event:event}; do
        if ! cmp -s buildmpm-prefork/modules-inside buildmpm-${mpm}/modules-inside; then
                echo "List of compiled modules is different between prefork-MPM and ${mpm}-MPM!"
                echo "Build failed."
@@ -1883,7 +1890,7 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
        DESTDIR=$RPM_BUILD_ROOT
 
 # install other mpm-s
-for mpm in %{?with_peruser:peruser} worker %{?with_event:event}; do
+for mpm in worker %{?with_event:event}; do
        install buildmpm-${mpm}/httpd.${mpm} $RPM_BUILD_ROOT%{_sbindir}/httpd.${mpm}
 done