- rel 2

- added init file
- split into subpages distcc-{common,inetd,standalone}

Changed files:
    distcc.spec -> 1.15

diff --git a/distcc.spec b/distcc.spec
index c29fbb41c12d5201834f4fd22fcf0910bf7a8933..10f81e1ce7f83399e11f41ffb71af8351e11285c 100644 (file)
--- a/distcc.spec
+++ b/distcc.spec
@@ -3,13 +3,14 @@ Summary(pl):  Program do rozdzielania kompilacji program
 Name:          distcc
 Group:         Development/Languages
 Version:       2.1
-Release:       1
+Release:       2
 License:       GPL
 URL:           http://distcc.samba.org
 Source0:       http://distcc.samba.org/ftp/distcc/%{name}-%{version}.tar.bz2
 Source1:       %{name}.inetd
-Source2:       %{name}.sh
-Source3:       %{name}.csh
+Source2:       %{name}.init
+Source3:       %{name}.sh
+Source4:       %{name}.csh
 Patch0:                %{name}-user.patch
 Patch1:                %{name}-hostfile.patch
 Patch2:                %{name}-hostopt.patch
@@ -32,6 +33,57 @@ na kilka maszyn w sieci. distcc powinien zawsze generowa
 rezultaty jak lokalna kompilacja, jest prosty w instalacji i u¿yciu
 oraz bardzo czêsto dwa lub wiêcej razy szybszy ni¿ lokalna kompilacja.
 
+%package common
+Summary:       common files for distcc
+Summary(pl):    Pliki  wspó³dzielone distcc 
+Group:          Daemons
+Obsoletes:      %{name} < %{name}-2.1-2
+
+
+%description common
+distcc is a program to distribute compilation of C or C++ code across
+several machines on a network. distcc should always generate the same
+results as a local compile, is simple to install and use, and is often
+two or more times faster than a local compile.
+
+%description -l pl common
+distcc jest programem pozwalaj±cym na dystrybucjê kompilacji C lub C++
+na kilka maszyn w sieci. distcc powinien zawsze generowaæ takie same
+rezultaty jak lokalna kompilacja, jest prosty w instalacji i u¿yciu
+oraz bardzo czêsto dwa lub wiêcej razy szybszy ni¿ lokalna kompilacja.
+
+
+%package inetd
+Summary:       inetd configs for distcc
+Summary(pl):    Pliki konfiguracyjne do u¿ycia distcc poprzez inetd
+Group:          Daemons
+PreReq:         %{name}-common = %{version}
+PreReq:         rc-inetd
+Obsoletes:      %{name} < %{name}-2.1-2
+
+%description inetd
+distcc configs for running from inetd.
+
+%description inetd -l pl
+Pliki konfiguracyjna distcc do startowania demona poprzez inetd.
+
+%package standalone
+Summary:       standalone daemon configs for distcc
+Summary(pl):   Pliki konfiguracyjne do startowania distcc w trybie standalone
+Group:         Daemons
+PreReq:                %{name}-common = %{version}
+PreReq:                rc-scripts
+Requires(post,preun):  /sbin/chkconfig
+Obsoletes:      %{name} < %{name}-2.1-2
+
+%description standalone
+distcc configs for running as a standalone daemon.
+
+%description standalone -l pl
+Pliki konfiguracyjne distcc do startowania demona w trybie
+standalone.
+
+
 %prep
 %setup -q
 
@@ -46,13 +98,16 @@ oraz bardzo cz
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd \
+          $RPM_BUILD_ROOT/etc/rc.d/init.d \
           $RPM_BUILD_ROOT/etc/profile.d
 
-%{makeinstall}
+%{__make} DESTDIR=$RPM_BUILD_ROOT install
+
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/distccd
-install %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/distcc
+install %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT/etc/profile.d
 
-%post
+%post inetd
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 if [ -f /var/lock/subsys/rc-inetd ]; then
         /etc/rc.d/init.d/rc-inetd reload 1>&2
@@ -60,19 +115,40 @@ else
         echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
 fi
 
-%postun
+%postun inetd
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 if [ -f /var/lock/subsys/rc-inetd ]; then
         /etc/rc.d/init.d/rc-inetd reload
 fi
 
+%post standalone
+/sbin/chkconfig --add distcc
+if [ -f /var/lock/subsys/distccd ]; then
+        /etc/rc.d/init.d/distcc restart 1>&2
+else
+        echo "Run \"/etc/rc.d/init.d/distcc start\" to start distcc daemon."
+fi
+
+%preun standalone
+if [ "$1" = "0" ]; then
+        if [ -f /var/lock/subsys/distccd ]; then
+                /etc/rc.d/init.d/distcc stop 1>&2
+        fi
+        /sbin/chkconfig --del distcc
+fi
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files
+%files common
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README linuxdoc/html/*
 %attr(755,root,root) %{_bindir}/*
 %attr(644,root,root) %{_mandir}/man?/*
-%attr(640,root,root) /etc/sysconfig/rc-inetd/distccd
 %attr(644,root,root) /etc/profile.d/*sh
+
+%files inetd
+%attr(640,root,root) /etc/sysconfig/rc-inetd/distccd
+
+%files standalone
+%attr(755,root,root) /etc/rc.d/init.d/distcc