Author: glen Date: Sun Jan 8 22:26:17 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %service in triggers
---- Files affected:
SPECS:
horde-turba.spec (1.65 -> 1.66)
---- Diffs:
================================================================
Index: SPECS/horde-turba.spec
diff -u SPECS/horde-turba.spec:1.65 SPECS/horde-turba.spec:1.66
--- SPECS/horde-turba.spec:1.65 Sun Jan 8 21:53:29 2006
+++ SPECS/horde-turba.spec Sun Jan 8 23:26:11 2006
@@ -164,20 +164,6 @@
fi
fi
-%triggerpostun -- turba <= 1.2.2-2
-if [ -f /etc/httpd/httpd.conf ]; then
- sed -i -e '/^Include.*turba.conf/d' /etc/httpd/httpd.conf
-fi
-
-if [ -f /etc/httpd/turba.conf.rpmsave ]; then
- cp -f %{_sysconfdir}/apache.conf{,.rpmnew}
- mv -f /etc/httpd/turba.conf.rpmsave %{_sysconfdir}/apache.conf
-fi
-
-if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
-fi
-
%triggerin -- apache1
%webapp_register apache %{_webapp}
@@ -190,6 +176,18 @@
%triggerun -- apache >= 2.0.0
%webapp_unregister httpd %{_webapp}
+%triggerpostun -- turba <= 1.2.2-2
+if [ -f /etc/httpd/httpd.conf ]; then
+ sed -i -e '/^Include.*turba.conf/d' /etc/httpd/httpd.conf
+fi
+
+if [ -f /etc/httpd/turba.conf.rpmsave ]; then
+ cp -f %{_sysconfdir}/apache.conf{,.rpmnew}
+ mv -f /etc/httpd/turba.conf.rpmsave %{_sysconfdir}/apache.conf
+fi
+
+%service -q httpd restart
+
%triggerpostun -- horde-%{_hordeapp} < 2.0.4-1.3, %{_hordeapp}
for i in attributes.php conf.php menu.php prefs.php sources.php; do
if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
@@ -246,6 +244,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.66 2006/01/08 22:26:11 glen
+- use %service in triggers
+
Revision 1.65 2006/01/08 20:53:29 glen
- update rfc2739.schema url
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/horde-turba.spec?r1=1.65&r2=1.66&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
