SPECS: irrd.spec - use %service

[glen]

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

---- Files affected:
SPECS:
   irrd.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/irrd.spec
diff -u SPECS/irrd.spec:1.15 SPECS/irrd.spec:1.16
--- SPECS/irrd.spec:1.15	Mon Dec 12 17:24:19 2005
+++ SPECS/irrd.spec	Tue Mar 14 01:45:16 2006
@@ -20,11 +20,12 @@
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
-Requires(post,preun): /sbin/chkconfig
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
 Requires:	setup >= 2.2.4-1.4
-#Suggest:	%{name}-cacher
-#Suggest:	mailer
+#Suggests:	%{name}-cacher
+#Suggests:	mailer
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -128,30 +129,20 @@
 
 %post
 /sbin/chkconfig --add irrd
-if [ -f /var/lock/subsys/irrd ]; then
-	/etc/rc.d/init.d/irrd restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/irrd start\" to start irrd daemon." >&2
-fi
+%service irrd restart "irrd daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/irrd ]; then
-		/etc/rc.d/init.d/irrd stop >&2
-	fi
+	%service irrd stop
 	/sbin/chkconfig --del irrd
 fi
 
 %post submit-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 submit-inetd
-if [ -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
 
 %files
@@ -189,6 +180,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2006/03/14 00:45:16  glen
+- use %service
+
 Revision 1.15  2005/12/12 16:24:19  glen
 - adapterized (sorted %verify attrs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/irrd.spec?r1=1.15&r2=1.16&f=u