X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=apache.spec;h=04eb43f98a22a133804d3e9fb912df9b73c5b7e5;hb=9bba86f316c8895d35a9e64d42c3b88f1af866d3;hp=c7e0457f14403a3a116d68d18dee091e9711c2a1;hpb=870cb2073c07ba938bce521c29a4f45273108bef;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index c7e0457..04eb43f 100644
--- 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)
@@ -2376,6 +2377,15 @@ if [ ! -L /etc/httpd/httpd.conf ]; then
 	install -d /etc/httpd
 	ln -s conf.d /etc/httpd/httpd.conf
 fi
+if [ -f /etc/sysconfig/httpd ]; then
+	MPM=$(grep HTTPD_MPM /etc/sysconfig/httpd |sed 's,HTTPD_MPM=,,;s,",,g')
+	if [ -n $MPM ]; 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
+	fi
+fi
+
 exit 0
 
 %post base
@@ -2481,24 +2491,13 @@ Please report bugs to <http://bugs.pld-linux.org/>.
 
 EOF
 
-%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
-
 %triggerpostun base -- %{name} < 2.4.0
-%banner -e %{name} << EOF
+%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