SPECS: ypserv.spec - use %service, fixed typo in trigger, rel 4

[glen]

Author: glen                         Date: Mon Mar 13 23:08:47 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service, fixed typo in trigger, rel 4

---- Files affected:
SPECS:
   ypserv.spec (1.65 -> 1.66) 

---- Diffs:

================================================================
Index: SPECS/ypserv.spec
diff -u SPECS/ypserv.spec:1.65 SPECS/ypserv.spec:1.66
--- SPECS/ypserv.spec:1.65	Tue Dec 13 16:51:53 2005
+++ SPECS/ypserv.spec	Tue Mar 14 00:08:42 2006
@@ -9,7 +9,7 @@
 Summary(zh_CN):	NIS(ÍřÂçĐĹϢˇţÎń)ˇţÎńĆ÷.
 Name:		ypserv
 Version:	2.17
-Release:	3
+Release:	4
 License:	GPL
 Group:		Networking/Daemons
 Source0:	ftp://ftp.kernel.org/pub/linux/utils/net/NIS/%{name}-%{version}.tar.bz2
@@ -26,12 +26,13 @@
 BuildRequires:	automake >= 1:1.7
 BuildRequires:	gdbm-devel
 BuildRequires:	libwrap-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	glibc >= 2.2
 Requires:	portmap
 Requires:	rc-scripts
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	yppasswd
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_libexecdir	%{_libdir}/yp
 
@@ -137,43 +138,29 @@
 
 %post
 /sbin/chkconfig --add ypserv
-if [ -f /var/lock/subsys/ypserv ]; then
-	/etc/rc.d/init.d/ypserv restart >&2
-else
-	echo "Run '/etc/rc.d/init.d/ypserv start' to start YP server." >&2
-fi
+%service ypserv restart "YP server"
+
 /sbin/chkconfig --add yppasswdd
-if [ -f /var/lock/subsys/yppasswdd ]; then
-	/etc/rc.d/init.d/yppasswdd restart >&2
-else
-	echo "Run '/etc/rc.d/init.d/yppasswdd start' to start YP password changing server." >&2
-fi
+%service yppasswdd restart "YP password changing server"
+
 /sbin/chkconfig --add ypxfrd
-if [ -f /var/lock/subsys/ypxfrd ]; then
-	/etc/rc.d/init.d/ypxfrd restart >&2
-else
-	echo "Run '/etc/rc.d/init.d/ypxfrd start' to start YP map server." >&2
-fi
+%service ypxfrd restart "YP map server"
 
 %triggerpostun -- ypserv <= ypserv-1.3.0-2
 /sbin/chkconfig --add ypserv
 
-%trigerpostun -- yppasswd
+%triggerpostun -- yppasswd
 /sbin/chkconfig --add yppasswdd
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/ypserv ]; then
-		/etc/rc.d/init.d/ypserv stop >&2
-	fi
+	%service ypserv stop
 	/sbin/chkconfig --del ypserv
-	if [ -f /var/lock/subsys/yppasswdd ]; then
-		/etc/rc.d/init.d/yppasswdd stop >&2
-	fi
+
+	%service yppasswdd stop
 	/sbin/chkconfig --del yppasswdd
-	if [ -f /var/lock/subsys/ypxfrd ]; then
-		/etc/rc.d/init.d/ypxfrd stop >&2
-	fi
+
+	%service ypxfrd stop
 	/sbin/chkconfig --del ypxfrd
 fi
 
@@ -197,6 +184,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66  2006/03/13 23:08:42  glen
+- use %service, fixed typo in trigger, rel 4
+
 Revision 1.65  2005/12/13 15:51:53  glen
 - adapterized (sorted %verify attrs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ypserv.spec?r1=1.65&r2=1.66&f=u