SPECS: horde-ingo.spec - use %service in triggers - trigger also o...

[glen]

Author: glen                         Date: Sun Jan  8 20:04:15 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service in triggers
- trigger also on old package name

---- Files affected:
SPECS:
   horde-ingo.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/horde-ingo.spec
diff -u SPECS/horde-ingo.spec:1.19 SPECS/horde-ingo.spec:1.20
--- SPECS/horde-ingo.spec:1.19	Thu Jan  5 19:05:48 2006
+++ SPECS/horde-ingo.spec	Sun Jan  8 21:04:09 2006
@@ -2,7 +2,7 @@
 %define	_hordeapp ingo
 #define	_snap	2005-08-26
 %define	_rc		rc1
-%define	_rel	1
+%define	_rel	1.1
 #
 %include	/usr/lib/rpm/macros.php
 Summary:	Ingo - an email filter rules manager
@@ -19,7 +19,7 @@
 Patch0:		%{_hordeapp}-path.patch
 URL:		http://www.horde.org/ingo/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
-BuildRequires:	rpmbuild(macros) >= 1.264
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	tar >= 1:1.15.1
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
@@ -113,7 +113,7 @@
 %triggerun -- apache >= 2.0.0
 %webapp_unregister httpd %{_webapp}
 
-%triggerpostun -- horde-%{_hordeapp} < 1.0.2-1.1
+%triggerpostun -- horde-%{_hordeapp} < 1.0.2-1.1, %{_hordeapp} < 1.0.2-1.1
 for i in backends.php conf.php fields.php prefs.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -131,16 +131,11 @@
 if [ -L /etc/apache/conf.d/99_horde-%{_hordeapp}.conf ]; then
 	/usr/sbin/webapp register apache %{_webapp}
 	rm -f /etc/apache/conf.d/99_horde-%{_hordeapp}.conf
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache reload 1>&2
-	fi
+	%service -q apache reload
 fi
 if [ -L /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf ]; then
 	/usr/sbin/webapp register httpd %{_webapp}
-	rm -f /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd reload 1>&2
-	fi
+	%service -q httpd reload
 fi
 
 %files
@@ -169,6 +164,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2006/01/08 20:04:09  glen
+- use %service in triggers
+- trigger also on old package name
+
 Revision 1.19  2006/01/05 18:05:48  paszczus
 - updated to 1.1rc1
 
================================================================

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