SPECS: daemontools.spec - fixed zombies in initscript after stop, ...

[glen]

Author: glen                         Date: Mon May  5 20:11:35 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed zombies in initscript after stop, drop findutils dep
- use own builddir
- /etc/tcprules.d moved to ucspi-tcp package
- versioned rc-scripts due --fork in daemon()
- rel 8

---- Files affected:
SPECS:
   daemontools.spec (1.44 -> 1.45) 

---- Diffs:

================================================================
Index: SPECS/daemontools.spec
diff -u SPECS/daemontools.spec:1.44 SPECS/daemontools.spec:1.45
--- SPECS/daemontools.spec:1.44	Sun Apr 27 02:37:46 2008
+++ SPECS/daemontools.spec	Mon May  5 22:11:29 2008
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	daemontools D. J. Bernsteina
 Name:		daemontools
 Version:	0.76
-Release:	7
+Release:	8
 License:	Public Domain
 Group:		Networking/Admin
 Source0:	http://cr.yp.to/daemontools/%{name}-%{version}.tar.gz
@@ -12,23 +12,17 @@
 # Source1-md5:	2d3858a48f293c87202f76cd883438ee
 Source2:	%{name}.sysconfig
 Source3:	%{name}.init
-Source4:	%{name}-tcprules
 Patch0:		%{name}-glibc.patch
 URL:		http://cr.yp.to/daemontools.html
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	/sbin/chkconfig
-# initscript uses find
-Requires:	findutils
-Requires:	rc-scripts
-# make and stat from coreutils are for building tcprules
-Requires:	coreutils
-Requires:	make
+Requires:	rc-scripts >= 0.4.0.10
+Conflicts:	ucspi-tcp < 0.88-7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # /etc/service or /var/lib/service? (also in .sysconfig)
 %define		servicedir	/service
-%define 	tcprules 	/etc/tcprules.d
 
 %description
 daemontools is a collection of tools for managing UNIX services.
@@ -58,29 +52,28 @@
 danych.
 
 %prep
-%setup -q -n admin -a1
-cd %{name}-%{version}/src
+%setup -q -c -a1
+mv admin/daemontools-%{version}/* .
+cd src
 %patch0 -p0
 
 %build
-cd %{name}-%{version}
-echo "%{__cc} %{rpmcflags} -Wall" >src/conf-cc
-echo "%{__cc} %{rpmldflags}" >src/conf-ld
-
-package/compile
+echo "%{__cc} %{rpmcflags} -Wall" > src/conf-cc
+echo "%{__cc} %{rpmldflags}" > src/conf-ld
+./package/compile
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \
 	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/supervise \
-	$RPM_BUILD_ROOT{/var/lib/service,%{servicedir},%{tcprules}}
+	$RPM_BUILD_ROOT{/var/lib/service,%{servicedir}}
 
 # install manuals
 install %{name}-man/*.8* $RPM_BUILD_ROOT%{_mandir}/man8
 
 # install binaries
-cd %{name}-%{version}/command
+cd command
 install envdir envuidgid fghack multilog pgrphack \
 	readproctitle setlock setuidgid softlimit \
 	supervise svc svok svscan svscanboot svstat tai64n tai64nlocal \
@@ -90,8 +83,6 @@
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/svscan
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/svscan
 
-install %{SOURCE4} $RPM_BUILD_ROOT%{tcprules}/Makefile
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -107,11 +98,10 @@
 
 %files
 %defattr(644,root,root,755)
-%doc %{name}-%{version}/{package/README,src/{CHANGES,TODO}}
+%doc package/README src/{CHANGES,TODO}
 %attr(755,root,root) %{_sbindir}/*
 %attr(700,root,root) %{servicedir}
 %dir %{_sysconfdir}/supervise
-%{tcprules}
 %attr(700,root,root) /var/lib/service
 %attr(754,root,root) /etc/rc.d/init.d/svscan
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/svscan
@@ -123,6 +113,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2008-05-05 20:11:29  glen
+- fixed zombies in initscript after stop, drop findutils dep
+- use own builddir
+- /etc/tcprules.d moved to ucspi-tcp package
+- versioned rc-scripts due --fork in daemon()
+- rel 8
+
 Revision 1.44  2008-04-27 00:37:46  glen
 - rel 7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/daemontools.spec?r1=1.44&r2=1.45&f=u