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

[glen]

Author: glen                         Date: Wed Jan  4 14:01:38 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service in trigger to respect skip auto restarts of services; rel 3

---- Files affected:
SPECS:
   phpMyAdmin.spec (1.119 -> 1.120) 

---- Diffs:

================================================================
Index: SPECS/phpMyAdmin.spec
diff -u SPECS/phpMyAdmin.spec:1.119 SPECS/phpMyAdmin.spec:1.120
--- SPECS/phpMyAdmin.spec:1.119	Tue Jan  3 11:53:38 2006
+++ SPECS/phpMyAdmin.spec	Wed Jan  4 15:01:33 2006
@@ -5,7 +5,7 @@
 Version:	2.7.0
 %define		_pl	pl2
 # release 1 is for Ra
-%define		_rel 2
+%define		_rel 3
 Release:	%{_pl}.%{_rel}
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
@@ -15,6 +15,7 @@
 Source1:	%{name}.conf
 Patch0:		%{name}-config.patch
 URL:		http://www.phpmyadmin.net/
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(triggerpostun):	sed >= 4.0
 Requires:	php
 Requires:	php-mysql
@@ -141,9 +142,7 @@
 
 rm -f /etc/httpd/httpd.conf/99_%{name}.conf
 /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
 
 %files
 %defattr(644,root,root,755)
@@ -167,6 +166,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120  2006/01/04 14:01:33  glen
+- use %service in trigger to respect skip auto restarts of services; rel 3
+
 Revision 1.119  2006/01/03 10:53:38  kosmo
 - pack more files.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/phpMyAdmin.spec?r1=1.119&r2=1.120&f=u