[packages/apache] Rel 2. dropped %pretrans for the upgrade from apache 2.2

arekm arekm at pld-linux.org
Tue Oct 13 00:59:05 CEST 2026


commit 789d478b03730a4e7282443690df58773ab55283
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Oct 13 00:54:58 2026 +0200

    Rel 2. dropped %pretrans for the upgrade from apache 2.2
    
    A sh %pretrans needs /bin/sh in the rpmdb already, so installing into
    an empty root failed.

 apache.spec | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index 61c9bd7..85eba42 100644
--- a/apache.spec
+++ b/apache.spec
@@ -35,7 +35,7 @@ Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
 Version:	2.4.69
-Release:	1
+Release:	2
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
@@ -3036,20 +3036,6 @@ rm -rf $RPM_BUILD_ROOT
 %groupadd -g 51 http
 %useradd -u 51 -r -d /home/services/httpd -s /bin/false -c "HTTP User" -g http http
 
-%pretrans base
-# upgrade to 2.4: handle $HTTPD_MPM from sysconfig
-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 -f /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
-
-exit 0
-
 %post base
 /sbin/chkconfig --add httpd
 umask 137
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/789d478b03730a4e7282443690df58773ab55283



More information about the pld-cvs-commit mailing list