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

[glen]

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

---- Files affected:
SPECS:
   horde-gollem.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/horde-gollem.spec
diff -u SPECS/horde-gollem.spec:1.23 SPECS/horde-gollem.spec:1.24
--- SPECS/horde-gollem.spec:1.23	Sat Jan  7 11:12:45 2006
+++ SPECS/horde-gollem.spec	Sun Jan  8 21:03:09 2006
@@ -2,7 +2,7 @@
 %define	_hordeapp	gollem
 #define	_snap	-
 %define	_rc		rc1
-%define	_rel	1
+%define	_rel	1.1
 #
 %include	/usr/lib/rpm/macros.php
 Summary:	Gollem - the Horde File Manager
@@ -19,7 +19,7 @@
 Patch0:		%{_hordeapp}-prefs.patch
 URL:		http://www.horde.org/gollem/
 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
@@ -106,7 +106,7 @@
 %triggerun -- apache >= 2.0.0
 %webapp_unregister httpd %{_webapp}
 
-%triggerpostun -- horde-%{_hordeapp} < 1.0-2.3
+%triggerpostun -- horde-%{_hordeapp} < 1.0-2.3, %{_hordeapp} < 1.0-2.3
 for i in apache.conf backends.php conf.php credentials.php httpd.conf menu.php mime_drivers.php motd.php prefs.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -124,16 +124,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
@@ -163,6 +159,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2006/01/08 20:03:09  glen
+- use %service in triggers
+- trigger also on old package name
+
 Revision 1.23  2006/01/07 10:12:45  paszczus
 - updated to 1.0.2rc1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/horde-gollem.spec?r1=1.23&r2=1.24&f=u