- remove HTTPD_MPM from sysconfig

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index 98db2354efda041b6855c3f378c9c480f391e1df..f035becc32ee811674f9652dcd48f979b290a2f8 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -32,7 +32,7 @@
 %define                _apache_modules_api 20120211
 
 %define                openssl_ver     0.9.8i
-%define                apr_ver         1:1.4.5
+%define                apr_ver         1:1.4.6
 %include       /usr/lib/rpm/macros.perl
 Summary:       The most widely used Web server on the Internet
 Summary(de.UTF-8):     Leading World Wide Web-Server
@@ -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
@@ -691,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)
@@ -2371,6 +2373,7 @@ if [ -f /etc/sysconfig/httpd ]; then
                echo "LoadModule mpm_${MPM}_module                modules/mod_mpm_${MPM}.so" > /etc/httpd/conf.d/10_mpm.conf.rpmnew
                cat /etc/httpd/conf.d/10_mpm.conf >> /etc/httpd/conf.d/10_mpm.conf.rpmnew
                mv /etc/httpd/conf.d/10_mpm.conf.rpmnew /etc/httpd/conf.d/10_mpm.conf
+               sed -i -e 's,HTTPD_MPM.*,,g' /etc/sysconfig/httpd
        fi
 fi
 
@@ -2480,7 +2483,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: