Author: glen Date: Wed Feb 23 16:05:36 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fix apache1 confdir trigger
---- Files affected:
SPECS:
horde.spec (1.69 -> 1.70)
---- Diffs:
================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.69 SPECS/horde.spec:1.70
--- SPECS/horde.spec:1.69 Wed Feb 23 17:04:29 2005
+++ SPECS/horde.spec Wed Feb 23 17:05:29 2005
@@ -179,15 +179,17 @@
%triggerpostun -- horde <= 3.0.3-2
# apache1 confdir
-if [ -f /etc/apache/apache.conf ] && grep -q '^Include conf\.d'
/etc/apache/apache.conf; then
- sed -i -e '
- /^Include.*mod_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,
- ' /etc/apache/apache.conf
+if [ -f /etc/apache/apache.conf ]; then
+ if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+ sed -i -e '
+ /^Include.*mod_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,
+ ' /etc/apache/apache.conf
+ fi
fi
if [ -f %{_apache1dir}/horde.conf.rpmsave ]; then
@@ -236,6 +238,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.70 2005/02/23 16:05:29 glen
+- fix apache1 confdir trigger
+
Revision 1.69 2005/02/23 16:04:29 glen
- configure default app log to /var/log/horde and add that dir
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.69&r2=1.70&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
