- change banner a bit

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index 23e530bf2fe22128cf34e1a8d5dd23b522fa0278..87504e5b5dd2d5cd6d10f4640a5abcdf223de5b8 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -193,6 +193,7 @@ Requires:   /sbin/chkconfig
 Requires:      apr >= %{apr_ver}
 Requires:      psmisc >= 20.1
 Requires:      rc-scripts >= 0.4.1.23
+Requires:      %{name}-mod_unixd = %{version}-%{release}
 Provides:      apache(modules-api) = %{_apache_modules_api}
 Provides:      group(http)
 Provides:      user(http)
@@ -2481,22 +2482,21 @@ Please report bugs to <http://bugs.pld-linux.org/>.
 
 EOF
 
-%triggerpostun base -- %{name} < 2.4.0
+%pretrans base -- %{name} < 2.4.0
 if [ -f /etc/sysconfig/httpd ]; then
        MPM=$(grep HTTPD_MPM /etc/sysconfig/httpd |sed 's,HTTPD_MPM=,,;s,",,g')
        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
 fi
-%banner -e %{name} << EOF
+
+%triggerpostun base -- %{name} < 2.4.0
+%banner %{name}-2.4.1 << 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:
 poldek -ivh %{name}-mod_access_compat
 
-If you use "User" statement install mod_unixd by doing:
-poldek -ivh %{name}-mod_unixd
-
 In apache-2.4 mod_authn_default and mod_authz_default have been obsoleted by
 mod_authn_core and authz_core. If you used these modules install the new ones by invoking:
 poldek -ivh %{name}-mod_authn_core