SPECS: apache.spec - always have httpd.conf compat symlink

[glen]

Author: glen                         Date: Mon Dec 19 14:05:50 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- always have httpd.conf compat symlink

---- Files affected:
SPECS:
   apache.spec (1.444 -> 1.445) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.444 SPECS/apache.spec:1.445
--- SPECS/apache.spec:1.444	Mon Dec 19 14:57:10 2005
+++ SPECS/apache.spec	Mon Dec 19 15:05:44 2005
@@ -38,7 +38,7 @@
 Summary(tr):	Lider WWW tarayýcý
 Name:		apache
 Version:	2.2.0
-Release:	0.84
+Release:	0.85
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -2013,17 +2013,21 @@
 
 %pretrans base
 # change httpd.conf from dir to symlink
-if [ -d /etc/httpd/httpd.conf ] && [ ! -L /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
+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
-	# we make compat symlink in post otherwise rpm would nuke our configs
+
+	# always have httpd.conf symlink (until all packages from Ac use new dir)
 	ln -s conf.d /etc/httpd/httpd.conf
-	# new module packages issue error as first installed over 2.0 installation
-	mv -f /var/lock/subsys/httpd{,.disabled} 2>/dev/null
 fi
 exit 0
 
@@ -2671,6 +2675,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.445  2005/12/19 14:05:44  glen
+- always have httpd.conf compat symlink
+
 Revision 1.444  2005/12/19 13:57:10  qboosh
 - more pl, unified
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.444&r2=1.445&f=u