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

[glen]

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

---- Files affected:
SPECS:
   horde-chora.spec (1.48 -> 1.49) 

---- Diffs:

================================================================
Index: SPECS/horde-chora.spec
diff -u SPECS/horde-chora.spec:1.48 SPECS/horde-chora.spec:1.49
--- SPECS/horde-chora.spec:1.48	Fri Dec  2 18:57:44 2005
+++ SPECS/horde-chora.spec	Sun Jan  8 20:59:05 2006
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 %define	_hordeapp	chora
 #define	_rc		rc1
-%define	_rel	2
+%define	_rel	2.7
 #
 %include	/usr/lib/rpm/macros.php
 Summary:	Web Based CVS Program
@@ -18,7 +18,7 @@
 Patch0:		%{_hordeapp}-prefs.patch
 URL:		http://www.horde.org/chora/
 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)
 # well. depending on configuration, it needs cvs, rcs or svn, cvsps >= 2.0b6
@@ -102,7 +102,7 @@
 %triggerun -- apache >= 2.0.0
 %webapp_unregister httpd %{_webapp}
 
-%triggerpostun -- horde-%{_hordeapp} < 2.0.1-1.1
+%triggerpostun -- horde-%{_hordeapp} < 2.0.1-1.1, %{_hordeapp} < 2.0.1-1.1
 for i in conf.php cvsgraph.conf longIntro.txt mime_drivers.php prefs.php sourceroots.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -120,16 +120,12 @@
 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
@@ -160,6 +156,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2006/01/08 19:59:05  glen
+- use %service in triggers
+- trigger also on old package name
+
 Revision 1.48  2005/12/02 17:57:44  glen
 - proper build macros
 
================================================================

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