SPECS: horde.spec - fix old apache conf.d migration trigger

[glen]

Author: glen                         Date: Sat Sep 17 01:14:56 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix old apache conf.d migration trigger

---- Files affected:
SPECS:
   horde.spec (1.102 -> 1.103) 

---- Diffs:

================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.102 SPECS/horde.spec:1.103
--- SPECS/horde.spec:1.102	Sat Sep 17 03:10:39 2005
+++ SPECS/horde.spec	Sat Sep 17 03:14:51 2005
@@ -257,14 +257,14 @@
 %triggerpostun -- horde <= 3.0.3-2.23
 # apache1 confdir
 if [ -f /etc/apache/apache.conf ]; then
-	if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+	if grep -q '^Include conf\.d/\*.conf' /etc/apache/apache.conf; then
 		sed -i -e '
-			/^Include.*mod_horde\.conf/d
+			/^Include.*horde\.conf/d
 		' /etc/apache/apache.conf
 	else
 		# they're still using old apache.conf
 		sed -i -e '
-			s,^Include.*mod_horde\.conf,Include %{_sysconfdir}/conf.d/*_mod_horde.conf,
+			s,^Include.*horde\.conf,Include conf.d/*_horde.conf,
 		' /etc/apache/apache.conf
 	fi
 fi
@@ -333,6 +333,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.103  2005/09/17 01:14:51  glen
+- fix old apache conf.d migration trigger
+
 Revision 1.102  2005/09/17 01:10:39  glen
 - using %{_hordeapp} macro, cosmetics
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.102&r2=1.103&f=u