SPECS: linux-identd.spec - use %service

[glen]

Author: glen                         Date: Tue Mar 14 00:55:14 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   linux-identd.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/linux-identd.spec
diff -u SPECS/linux-identd.spec:1.8 SPECS/linux-identd.spec:1.9
--- SPECS/linux-identd.spec:1.8	Tue Dec 13 12:54:17 2005
+++ SPECS/linux-identd.spec	Tue Mar 14 01:55:07 2006
@@ -6,17 +6,18 @@
 Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
-# Source0-md5:	c3517f612b351e46951d2ecb0c60b767
 Source0:	http://www.fukt.bth.se/~per/identd/%{name}-%{version}.tar.gz
+# Source0-md5:	c3517f612b351e46951d2ecb0c60b767
 Source1:	%{name}.inetd
 Source2:	%{name}.sysconfig
 Source3:	%{name}.init
 URL:		http://www.fukt.bth.se/~per/identd/
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	linux-identd-frontend
 Provides:	identserver
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	oidentd
 Obsoletes:	pidentd
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 linux-identd is a user identification daemon for Linux, which
@@ -36,11 +37,11 @@
 Summary:	Simple ident daemon
 Summary(pl):	Prosty demon ident
 Group:		Networking/Daemons
-Provides:	linux-identd-frontend
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}
 Requires:	rc-scripts
-Obsoletes:	%{name}-inetd
+Provides:	linux-identd-frontend
+Obsoletes:	linux-identd-inetd
 
 %description standalone
 linux-identd standalone version.
@@ -52,11 +53,11 @@
 Summary:	Simple ident daemon
 Summary(pl):	Prosty demon ident
 Group:		Networking/Daemons
-Provides:	linux-identd-frontend
 Requires:	%{name} = %{version}
 Requires:	inetdaemon
 Requires:	rc-inetd
-Obsoletes:	%{name}-standalone
+Provides:	linux-identd-frontend
+Obsoletes:	linux-identd-standalone
 
 %description inetd
 linux-identd inetd version.
@@ -85,30 +86,20 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post inetd
-if [ -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd reload 1>&2
-else
-	echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
-fi
+%service -q rc-inetd reload
 
 %postun inetd
-if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd reload 1>&2
+if [ "$1" = "0" ]; then
+	%service -q rc-inetd reload
 fi
 
 %post standalone
 /sbin/chkconfig --add identd
-if [ -f /var/lock/subsys/identd ]; then
-	/etc/rc.d/init.d/identd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/identd start\" to start ident daemon."
-fi
+%service identd restart "ident daemon"
 
 %preun standalone
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/identd ]; then
-		/etc/rc.d/init.d/identd stop 1>&2
-	fi
+	%service identd stop
 	/sbin/chkconfig --del identd
 fi
 
@@ -133,6 +124,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2006/03/14 00:55:07  glen
+- use %service
+
 Revision 1.8  2005/12/13 11:54:17  glen
 - adalterized (sorted %verify flags)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/linux-identd.spec?r1=1.8&r2=1.9&f=u