SPECS: xinetd.spec - use %service

[glen]

Author: glen                         Date: Tue Mar 14 01:20:45 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   xinetd.spec (1.62 -> 1.63) 

---- Diffs:

================================================================
Index: SPECS/xinetd.spec
diff -u SPECS/xinetd.spec:1.62 SPECS/xinetd.spec:1.63
--- SPECS/xinetd.spec:1.62	Sun Mar 12 19:19:06 2006
+++ SPECS/xinetd.spec	Tue Mar 14 02:20:40 2006
@@ -11,8 +11,8 @@
 Name:		xinetd
 Version:	2.3.14
 Release:	2
-Group:		Daemons
 License:	BSD-like
+Group:		Daemons
 Source0:	http://www.xinetd.org/%{name}-%{version}.tar.gz
 # Source0-md5:	567382d7972613090215c6c54f9b82d9
 Source1:	%{name}.inet.sh
@@ -26,13 +26,14 @@
 %{?with_howl:BuildRequires:	howl-devel >= 1.0.0-4}
 BuildRequires:	libwrap-devel
 %{?with_howl:BuildRequires:	pkgconfig}
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	rc-inetd
 Requires:	rc-inetd
 Provides:	inetdaemon
-Obsoletes:	inetdaemon
 Obsoletes:	inetd
-Obsoletes:	rlinetd
+Obsoletes:	inetdaemon
 Obsoletes:	netkit-base
+Obsoletes:	rlinetd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-fno-strict-aliasing
@@ -149,15 +150,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd restart 1>&2
-else
-	echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start xinetd" 1>&2
-fi
+%service rc-inetd restart "xinetd"
 
 %preun
-if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd stop
+if [ "$1" = "0" ]; then
+	%service rc-inetd stop
 fi
 
 %files
@@ -174,6 +171,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2006/03/14 01:20:40  glen
+- use %service
+
 Revision 1.62  2006/03/12 18:19:06  qboosh
 - BR fixed howl, release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xinetd.spec?r1=1.62&r2=1.63&f=u