X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=distcc.spec;h=83f2060f353eeb3d4902d9274a0df052e20bdba1;hb=4b208a68010527f360058aadb8cc23f081b1f2df;hp=dbfeebd05d2968828c557b7713611a002ebb3866;hpb=a300d94a83ce6656ff0361eaf1d600664fa5e4da;p=packages%2Fdistcc.git

diff --git a/distcc.spec b/distcc.spec
index dbfeebd..83f2060 100644
--- a/distcc.spec
+++ b/distcc.spec
@@ -1,23 +1,25 @@
+#
+# Conditional build:
+# _without_gtk	build without gtk2(monitor) support
+#
 Summary:	Program to distribute compilation of C or C++
 Summary(pl):	Program do rozdzielania kompilacji programów w C lub C++
 Name:		distcc
 Group:		Development/Languages
-Version:	2.0.1
-Release:	3
+Version:	2.9
+Release:	2
 License:	GPL
-URL:		http://distcc.samba.org
+URL:		http://distcc.samba.org/
 Source0:	http://distcc.samba.org/ftp/distcc/%{name}-%{version}.tar.bz2
+# Source0-md5:	fa4cbb8dbebb0d87b0d1da7d2d34bf57
 Source1:	%{name}.inetd
-Source2:	%{name}.sh
-Source3:	%{name}.csh
+Source2:	%{name}.init
+Source3:	%{name}.sh
+Source4:	%{name}.csh
+Source5:	%{name}.config
 Patch0:		%{name}-user.patch
-Patch1:		%{name}-hostfile.patch
-Patch2:		%{name}-hostopt.patch
-Requires:	gcc
-Requires:	gcc-c++
-Requires:	inetdaemon
+%{!?_without_gtk:BuildRequires:	gtk+2-devel >= 2.0}
 BuildRequires:	popt-devel
-Prereq:         /sbin/chkconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,47 +34,122 @@ 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 inetd and standalone versions of distcc
+Summary(pl):	Pliki wspólne dla wersji inetd i standalone distcc
+Group:		Daemons
+Requires:	gcc
+Requires:	gcc-c++
+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 common -l pl
+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
-
 %patch -p1
-%patch1 -p1
-%patch2 -p0
 
 %build
-%configure
+%configure \
+	%{!?_without_gtk:--enable-gnome}
+
 %{__make}
 
 %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} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
 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
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/distccd
 
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post inetd
 if [ -f /var/lock/subsys/rc-inetd ]; then
         /etc/rc.d/init.d/rc-inetd reload 1>&2
 else
         echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
 fi
 
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%postun inetd
 if [ -f /var/lock/subsys/rc-inetd ]; then
         /etc/rc.d/init.d/rc-inetd reload
 fi
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+%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
 
-%files
+%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
+
+%files common
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README linuxdoc/html/*
+%doc AUTHORS NEWS README *.txt
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/distccd
 %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) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rc-inetd/distccd
+
+%files standalone
+%attr(755,root,root) /etc/rc.d/init.d/distcc