SPECS: horde-giapeto.spec - use %service in triggers

glen glen at pld-linux.org
Sun Jan 8 21:03:44 CET 2006


Author: glen                         Date: Sun Jan  8 20:03:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service in triggers

---- Files affected:
SPECS:
   horde-giapeto.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/horde-giapeto.spec
diff -u SPECS/horde-giapeto.spec:1.9 SPECS/horde-giapeto.spec:1.10
--- SPECS/horde-giapeto.spec:1.9	Fri Dec  2 18:57:44 2005
+++ SPECS/horde-giapeto.spec	Sun Jan  8 21:03:39 2006
@@ -2,7 +2,7 @@
 %define	_hordeapp giapeto
 #define	_rc		rc1
 %define	_snap	2005-09-17
-%define	_rel	0.6
+%define	_rel	0.18
 
 %include	/usr/lib/rpm/macros.php
 Summary:	Web-site Content Management System
@@ -17,7 +17,7 @@
 Source1:	%{_hordeapp}.conf
 URL:		http://www.horde.org/giapeto/
 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
@@ -132,16 +132,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
@@ -173,6 +169,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/01/08 20:03:39  glen
+- use %service in triggers
+
 Revision 1.9  2005/12/02 17:57:44  glen
 - proper build macros
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/horde-giapeto.spec?r1=1.9&r2=1.10&f=u



More information about the pld-cvs-commit mailing list