SPECS: template-apache-package.spec - use %service

[glen]

Author: glen                         Date: Fri May 19 21:25:07 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   template-apache-package.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/template-apache-package.spec
diff -u SPECS/template-apache-package.spec:1.24 SPECS/template-apache-package.spec:1.25
--- SPECS/template-apache-package.spec:1.24	Tue Nov 15 23:41:10 2005
+++ SPECS/template-apache-package.spec	Fri May 19 23:25:02 2006
@@ -70,33 +70,25 @@
 if [ -f /etc/httpd/%{name}.conf.rpmsave ]; then
 	cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew}
 	mv -f /etc/httpd/%{name}.conf.rpmsave %{_sysconfdir}/apache-%{name}.conf
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd reload 1>&2
-	fi
+	%service -q httpd reload
 fi
 
 # nuke very-old config location (this mostly for Ra)
 if [ ! -d /etc/httpd/httpd.conf ]; then
 	sed -i -e "/^Include.*%{name}.conf/d" /etc/httpd/httpd.conf
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd reload 1>&2
-	fi
+	%service -q httpd reload
 fi
 
 # place new config location, as trigger puts config only on first install, do it here.
 # apache1
 if [ -d /etc/apache/conf.d ]; then
 	ln -sf %{_sysconfdir}/apache-%{name}.conf /etc/apache/conf.d/99_%{name}.conf
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache reload 1>&2
-	fi
+	%service -q apache reload
 fi
 # apache2
 if [ -d /etc/httpd/httpd.conf ]; then
 	ln -sf %{_sysconfdir}/apache-%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd reload 1>&2
-	fi
+	%service -q httpd reload
 fi
 %endif # END OF SAMPLE TRIGGER
 
@@ -115,6 +107,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2006/05/19 21:25:02  glen
+- use %service
+
 Revision 1.24  2005/11/15 22:41:10  glen
 - as per discussion in devel-en, unify virtual webserver usage
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/template-apache-package.spec?r1=1.24&r2=1.25&f=u