SPECS: horde-imp.spec - merge triggers; use %service in triggers

[glen]

Author: glen                         Date: Sun Jan  8 15:08:00 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge triggers; use %service in triggers

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

---- Diffs:

================================================================
Index: SPECS/horde-imp.spec
diff -u SPECS/horde-imp.spec:1.102 SPECS/horde-imp.spec:1.103
--- SPECS/horde-imp.spec:1.102	Thu Jan  5 19:10:24 2006
+++ SPECS/horde-imp.spec	Sun Jan  8 16:07:54 2006
@@ -2,7 +2,7 @@
 %define	_hordeapp	imp
 #define	_snap	2005-08-22
 %define	_rc		rc1
-%define	_rel	1
+%define	_rel	1.2
 #
 %include	/usr/lib/rpm/macros.php
 Summary:	Web Based IMAP Mail Program
@@ -23,7 +23,7 @@
 Patch1:		%{_hordeapp}-prefs.patch
 URL:		http://www.horde.org/imp/
 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
@@ -115,7 +115,7 @@
 %triggerun -- apache >= 2.0.0
 %webapp_unregister httpd %{_webapp}
 
-%triggerpostun -- imp <= 3.2.6-0.1
+%triggerpostun -- imp <= 4.0.2-1
 for i in conf.php filter.txt header.txt html.php menu.php mime_drivers.php motd.php prefs.php servers.php trailer.txt; do
 	if [ -f /home/services/httpd/html/horde/imp/config/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -123,17 +123,13 @@
 	fi
 done
 
-%triggerpostun -- imp <= 4.0.2-1
 if [ -f /etc/httpd/imp.conf.rpmsave ]; then
 	mv -f %{_sysconfdir}/apache.conf{,.rpmnew}
 	mv -f %{_sysconfdir}/httpd.conf{,.rpmnew}
 	cp -f /etc/httpd/imp.conf.rpmsave %{_sysconfdir}/apache.conf
 	cp -f /etc/httpd/imp.conf.rpmsave %{_sysconfdir}/httpd.conf
 	rm -f /etc/httpd/imp.conf.rpmsave
-fi
-
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd reload 1>&2
+	%service -q httpd reload
 fi
 
 %triggerpostun -- horde-imp < 4.0.4-1.10
@@ -153,18 +149,14 @@
 fi
 
 if [ -L /etc/apache/conf.d/99_horde-imp.conf ]; then
-	/usr/sbin/webapp register apache %{_webapp}
 	rm -f /etc/apache/conf.d/99_horde-imp.conf
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache reload 1>&2
-	fi
+	/usr/sbin/webapp register apache %{_webapp}
+	%service -q apache reload
 fi
 if [ -L /etc/httpd/httpd.conf/99_horde-imp.conf ]; then
-	/usr/sbin/webapp register httpd %{_webapp}
 	rm -f /etc/httpd/httpd.conf/99_horde-imp.conf
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd reload 1>&2
-	fi
+	/usr/sbin/webapp register httpd %{_webapp}
+	%service -q httpd reload
 fi
 
 %files
@@ -194,6 +186,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.103  2006/01/08 15:07:54  glen
+- merge triggers; use %service in triggers
+
 Revision 1.102  2006/01/05 18:10:24  paszczus
 - using 0.rc1.1 release
 
================================================================

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