- root@ default as serveradmin address

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index 30b2cf494e71ec1be4e18409519a30d26508a426..63aa34f6b8d7b17ac31f02fc22f7e2228d52afc0 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -9,6 +9,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
@@ -18,12 +24,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.13
-Release:       2
+Version:       2.2.14
+Release:       7
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: 2803e35be6650f5b739e6e91faa824dd
+# Source0-md5: 2c1e3c7ba00bcaa0163da7b3e66aaa1e
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -82,9 +88,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
@@ -93,9 +100,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}
@@ -1358,6 +1363,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"
@@ -1511,6 +1517,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