- 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

Changed files:
    daemontools.spec -> 1.45

diff --git a/daemontools.spec b/daemontools.spec
index 16029824adff97db7872a1a0bd86fd5b4ce6b4f4..99281ca28dc668ce86b5b81c89fd9f531c675d64 100644 (file)
--- a/daemontools.spec
+++ b/daemontools.spec
@@ -2,7 +2,7 @@ Summary:        D. J. Bernstein daemontools
 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
@@ -11,23 +11,17 @@ Source1:    http://smarden.org/pape/djb/manpages/%{name}-%{version}-man.tar.gz
 # 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.
@@ -57,29 +51,28 @@ Jeżeli dysk jest zapełniony, pauzuje i próbuje ponownie, bez strat
 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 \
@@ -89,8 +82,6 @@ install envdir envuidgid fghack multilog pgrphack \
 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
 
@@ -106,11 +97,10 @@ fi
 
 %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