From: Bartosz Świątek Date: Fri, 24 Feb 2012 17:36:41 +0000 (+0100) Subject: - move this into main pretrans X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=5e5a3613fe76433d21126f05c1dbff3735fade44;p=packages%2Fapache.git - move this into main pretrans --- diff --git a/apache.spec b/apache.spec index 87504e5..04eb43f 100644 --- a/apache.spec +++ b/apache.spec @@ -2377,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 @@ -2482,14 +2491,6 @@ Please report bugs to . 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 %{name}-2.4.1 << EOF WARNING!!!