SPECS: mrouted.spec - use %service

glen glen at pld-linux.org
Mon May 22 19:23:25 CEST 2006


Author: glen                         Date: Mon May 22 17:23:25 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   mrouted.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/mrouted.spec
diff -u SPECS/mrouted.spec:1.23 SPECS/mrouted.spec:1.24
--- SPECS/mrouted.spec:1.23	Mon May 22 18:51:23 2006
+++ SPECS/mrouted.spec	Mon May 22 19:23:19 2006
@@ -12,6 +12,7 @@
 Patch0:		%{name}-linux-glibc.patch
 Patch1:		%{name}-pointtopoint.patch
 Patch2:		%{name}-paths.patch
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	yacc
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
@@ -56,18 +57,12 @@
 
 %post
 /sbin/chkconfig --add mrouted
-if [ -f /var/lock/subsys/mrouted ]; then
-	/etc/rc.d/init.d/mrouted restart >&2
-else
-	echo "Run '/etc/rc.d/init.d/mrouted start' to start routing daemon." >&2
-fi
+%service mrouted restart "routing daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/mrouted ]; then
-		/etc/rc.d/init.d/mrouted stop >&2
-	fi
-        /sbin/chkconfig --del mrouted >&2
+	%service mrouted stop
+	/sbin/chkconfig --del mrouted
 fi
 
 %files
@@ -84,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2006/05/22 17:23:19  glen
+- use %service
+
 Revision 1.23  2006/05/22 16:51:23  blaass
 - spelling fix
 
@@ -106,13 +104,13 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.16  2002/12/07 14:33:31  ankry
-- fix improper usage of %%{_sysconfdir}
+- fix improper usage of %{_sysconfdir}
 
 Revision 1.15  2002/11/27 22:06:23  juandon
-- new %%doc
+- new %doc
 
 Revision 1.14  2002/03/27 10:57:32  roman
-s/Custom/custom in License
+- s/Custom/custom in License
 
 Revision 1.13  2002/02/23 03:54:21  kloczek
 - adapterized.
@@ -122,7 +120,7 @@
   Group field using gettext).
 
 Revision 1.11  2002/01/18 02:13:58  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.10  2001/12/06 11:44:35  qboosh
 - pl translations, cosmetics
@@ -131,13 +129,13 @@
 - reverting last change: removing new macros from %p{re,ost}{,un}
 
 Revision 1.7  2001/05/02 21:51:24  qboosh
-- adapterized and made spec %%debug ready or added using %%rpm*flags macros
+- adapterized and made spec %debug ready or added using %rpm*flags macros
 
 Revision 1.6  2001/02/01 16:27:34  kloczek
 - Requires for rc-scripts changed to Prereq.
 
 Revision 1.5  2000/06/09 07:23:26  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.4  2000/06/07 03:33:09  kloczek
 - spec adapterized.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mrouted.spec?r1=1.23&r2=1.24&f=u



More information about the pld-cvs-commit mailing list