SPECS: daemontools.spec - R: chkconfig - use %service; rel 4

[glen]

Author: glen                         Date: Mon Jun 19 09:32:18 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- R: chkconfig
- use %service; rel 4

---- Files affected:
SPECS:
   daemontools.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: SPECS/daemontools.spec
diff -u SPECS/daemontools.spec:1.38 SPECS/daemontools.spec:1.39
--- SPECS/daemontools.spec:1.38	Wed Oct 12 12:14:08 2005
+++ SPECS/daemontools.spec	Mon Jun 19 11:32:13 2006
@@ -3,7 +3,7 @@
 Summary(pl):	daemontools D. J. Bernsteina
 Name:		daemontools
 Version:	0.76
-Release:	3
+Release:	4
 License:	DJB (http://cr.yp.to/distributors.html)
 Group:		Networking/Admin
 Source0:	http://cr.yp.to/daemontools/%{name}-%{version}.tar.gz
@@ -15,11 +15,13 @@
 Source4:	%{name}-tcprules
 Patch0:		%{name}-glibc.patch
 URL:		http://cr.yp.to/daemontools.html
-Requires:	rc-scripts
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
+Requires:	/sbin/chkconfig
+Requires:	rc-scripts
 # make and stat from coreutils are for building tcprules
-Requires:	make
 Requires:	coreutils
+Requires:	make
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # /etc/service or /var/lib/service? (also in .sysconfig)
@@ -92,17 +94,11 @@
 
 %post
 /sbin/chkconfig --add svscan
-if [ -f /var/lock/subsys/svscan ]; then
-	/etc/rc.d/init.d/svscan restart >&2
-else
-	echo "Execute \"/etc/rc.d/init.d/svscan start\" to start svscan daemon."
-fi
+%service svscan restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/svscan ]; then
-		/etc/rc.d/init.d/svscan stop >&2
-	fi
+	%service svscan stop
 	/sbin/chkconfig --del svscan
 fi
 
@@ -123,6 +119,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2006/06/19 09:32:13  glen
+- R: chkconfig
+- use %service; rel 4
+
 Revision 1.38  2005/10/12 10:14:08  qboosh
 - sorted verify() flags
 
@@ -147,7 +147,7 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.31  2003/04/06 16:17:14  qboosh
-- changed prep so clean works now (no slashes in %%setup -n)
+- changed prep so clean works now (no slashes in %setup -n)
 - use optflags, use macro for service directory
   (to be changed for FHS compatibility? we cannot distrubute binaries anyway)
 - more specific Requires, pl fixes
@@ -168,13 +168,13 @@
 - typo, STBR.
 
 Revision 1.25  2002/10/10 13:20:35  marcus
-- use new %%doc
+- use new %doc
 
 Revision 1.24  2002/10/01 18:14:21  mwinkler
 - fixed typo
 
 Revision 1.23  2002/04/25 16:09:03  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.22  2002/02/23 01:44:58  kloczek
 - adapterized.
@@ -184,7 +184,7 @@
   Group field using gettext).
 
 Revision 1.20  2002/01/18 02:12:39  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.19  2001/11/23 14:51:02  kloczek
 - s/Copyright/License/
@@ -206,7 +206,7 @@
 
 Revision 1.13  2001/05/24 14:46:21  blues
 - Release 3
-STB
+- STB
 
 Revision 1.12  2001/05/24 14:43:02  blues
 - added missing init script (in spec only)
@@ -255,7 +255,3 @@
 
 Revision 1.1  1999/10/07 20:21:25  waszi
 - first cvs release
-
-* Mon Apr 27 1998 Sergiusz Pawlowicz <ser at serek.arch.pwr.wroc.pl>
-- first build for redhat-5.1, PGCC!
-- added redhat.patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/daemontools.spec?r1=1.38&r2=1.39&f=u