SPECS: newsportal.spec - use %service in trigger to respect skip a...

[glen]

Author: glen                         Date: Wed Jan  4 13:57:06 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service in trigger to respect skip auto restarts of services

---- Files affected:
SPECS:
   newsportal.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/newsportal.spec
diff -u SPECS/newsportal.spec:1.24 SPECS/newsportal.spec:1.25
--- SPECS/newsportal.spec:1.24	Wed Jan  4 14:50:46 2006
+++ SPECS/newsportal.spec	Wed Jan  4 14:57:01 2006
@@ -12,7 +12,7 @@
 Source1:	%{name}-apache.conf
 Patch0:		%{name}-path.patch
 URL:		http://florian-amrhein.de/newsportal/
-BuildRequires:	rpmbuild(macros) >= 1.264
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	php
 Requires:	php-pcre
 Requires:	php-iconv
@@ -101,16 +101,12 @@
 # no earlier registration. autodetect based on installed webservers
 if [ -d /etc/apache/webapps.d ]; then
 	/usr/sbin/webapp register apache %{_webapp}
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache reload 1>&2
-	fi
+	%service apache reload
 fi
 
 if [ -d /etc/httpd/webapps.d ]; then
 	/usr/sbin/webapp register httpd %{_webapp}
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd reload 1>&2
-	fi
+	%service httpd reload
 fi
 
 %files
@@ -130,6 +126,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2006/01/04 13:57:01  glen
+- use %service in trigger to respect skip auto restarts of services
+
 Revision 1.24  2006/01/04 13:50:46  glen
 - use webapps framework
 - add apache config
================================================================

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