X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=apache.spec;h=e964fe5c68636c0e4661233832b0f86f52aa656c;hb=HEAD;hp=17607d6ecf2caf4c67e02eeca4b52302e8644ea7;hpb=a19b796ca6e165ce24c7d6f726e49e290be4f324;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index 17607d6..e964fe5 100644
--- 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.54
+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:	861b43073ab416d689f1fc4dfa087711
+# Source0-md5:	9f77eb01b2fddfb4b32d469af90fb01b
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
@@ -213,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
@@ -325,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.
@@ -1427,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.
@@ -1573,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