- up to 2.4.59

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index d66237dfd2681ed50a38e1279042e16e9a92cffc..e964fe5c68636c0e4661233832b0f86f52aa656c 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -34,12 +34,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.4.49
+Version:       2.4.59
 Release:       1
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
-# Source0-md5: f294efbeabcf6027fccc7983a6daa55f
+# Source0-md5: 9f77eb01b2fddfb4b32d469af90fb01b
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -98,6 +98,7 @@ BuildRequires:        apr-devel >= %{apr_ver}
 BuildRequires: apr-util-devel >= %{apr_util_ver}
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
+BuildRequires: curl-devel
 %{?with_distcache:BuildRequires:       distcache-devel}
 BuildRequires: jansson-devel
 BuildRequires: libbrotli-devel >= 0.6.0
@@ -212,13 +213,8 @@ Provides:  apache(modules-api) = %{_apache_modules_api}
 Provides:      group(http)
 Provides:      user(http)
 Provides:      webserver = apache
-Obsoletes:     apache-extra
-Obsoletes:     apache6
-# packaged by mistake. really sample code
-Obsoletes:     apache-mod_optional_fn_export
-Obsoletes:     apache-mod_optional_fn_import
-Obsoletes:     apache-mod_optional_fn_import
-Obsoletes:     apache-mod_optional_hook_import
+Obsoletes:     apache-extra < 1.3.1
+Obsoletes:     apache6 < 1.3.4
 Conflicts:     apache < 2.2.0
 # mod_wsgi >= 3.4 is required for apache 2.4
 Conflicts:     apache-mod_wsgi < 3.4
@@ -324,8 +320,8 @@ Summary(ru.UTF-8):  Средства разработки модулей для 
 Group:         Networking/Utilities
 Requires:      apr-util-devel >= %{apr_util_ver}
 Requires:      libtool
-Obsoletes:     apache-apxs
-Obsoletes:     apache-static
+Obsoletes:     apache-apxs < 2.2.6-3
+Obsoletes:     apache-static < 2.0.47-1
 
 %description devel
 The apache-devel package contains header files for Apache.
@@ -1426,7 +1422,7 @@ Group:            Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.4/mod/mod_file_cache.html
 Requires:      %{name}-base = %{version}-%{release}
 Provides:      apache(mod_file_cache) = %{version}-%{release}
-Obsoletes:     apache-mmap_static
+Obsoletes:     apache-mod_mmap_static < 2
 
 %description mod_file_cache
 Caches a static list of files in memory.
@@ -1572,7 +1568,7 @@ URL:              http://httpd.apache.org/docs/2.4/mod/mod_imagemap.html
 Requires:      %{name}-base = %{version}-%{release}
 Provides:      apache(mod_imagemap) = %{version}-%{release}
 Provides:      apache-mod_imap
-Obsoletes:     apache-mod_imap
+Obsoletes:     apache-mod_imap < 2.2.0-1
 
 %description mod_imagemap
 This module processes .map files, thereby replacing the functionality