From 3ab52df8274d8007618146fe8e7f062c2f10d142 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Sat, 2 May 2015 20:28:59 +0300
Subject: [PATCH] drop httpd.conf symlink trigger as well. refs 5aeda90

---
 apache.spec | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/apache.spec b/apache.spec
index 31f50f0..6c9e3fc 100644
--- a/apache.spec
+++ b/apache.spec
@@ -2875,25 +2875,6 @@ rm -rf $RPM_BUILD_ROOT
 %useradd -u 51 -r -d /home/services/httpd -s /bin/false -c "HTTP User" -g http http
 
 %pretrans base
-# change httpd.conf from dir to symlink
-if [ ! -L /etc/httpd/httpd.conf ]; then
-	if [ -d /etc/httpd/httpd.conf ]; then
-		if [ -d /etc/httpd/conf.d ]; then
-			mv /etc/httpd/httpd.conf/* /etc/httpd/conf.d
-			rmdir /etc/httpd/httpd.conf 2>/dev/null || mv -v /etc/httpd/httpd.conf{,.rpmsave}
-		else
-			mv /etc/httpd/httpd.conf /etc/httpd/conf.d
-		fi
-
-		# new module packages issue error as first installed over 2.0 installation
-		mv -f /var/lock/subsys/httpd{,.disabled} 2>/dev/null
-	fi
-
-	# always have httpd.conf symlink (until all packages from Ac use new dir)
-	install -d /etc/httpd
-	ln -s conf.d /etc/httpd/httpd.conf
-fi
-
 # handle $HTTPD_MPM from sysconfig
 if [ -f /etc/sysconfig/httpd ]; then
 	MPM=$(grep ^HTTPD_MPM /etc/sysconfig/httpd | sed 's,HTTPD_MPM=,,;s,",,g')
-- 
2.44.0