X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=apache.spec;h=1084d26bc53963c9bc54b53063c89364ae745106;hb=88966783c9e2be11bd73f47858d4e29eb3fe3a65;hp=0d687310c2c4ec0d73d4692cb8d25a2ca1a92f97;hpb=1801affac7121bb9bb4859fc0d083a7353ea8589;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index 0d68731..1084d26 100644
--- a/apache.spec
+++ b/apache.spec
@@ -44,7 +44,7 @@ Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
 Version:	2.4.1
-Release:	0.1
+Release:	0.4
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -575,7 +575,6 @@ Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.4/mod/mod_authn_core.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authn_core) = %{version}-%{release}
-Provides:	apache(mod_authn_default) = %{version}-%{release}
 Obsoletes:	apache-mod_authn_default < 2.4
 
 %description mod_authn_core
@@ -654,7 +653,6 @@ Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.4/mod/mod_authz_core.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authz_core) = %{version}-%{release}
-Provides:	apache(mod_authz_default) = %{version}-%{release}
 Obsoletes:	apache-mod_authz_default < 2.4
 
 %description mod_authz_core
@@ -693,6 +691,8 @@ Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.4/mod/mod_authz_host.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authz_host) = %{version}-%{release}
+# for upgrade from 2.2, maybe this should be a "Suggests", but it's safer to require it by force
+Requires:	apache(mod_access_compat) = %{version}-%{release}
 # for apache < 2.2.0
 Provides:	apache(mod_access) = %{version}-%{release}
 Provides:	webserver(access)
@@ -2482,7 +2482,7 @@ Please report bugs to <http://bugs.pld-linux.org/>.
 EOF
 
 %triggerpostun base -- %{name} < 2.4.0
-%banner %{name}-2.4.1 << EOF
+%banner -e %{name} << EOF
 WARNING!!!
 Since apache-2.4 mod_authn_alias has been obsoleted.
 If you use access control (Deny,Allow) install mod_access_compat by doing: