From 412449e235e4009ae97f9735f2de336c7f25e922 Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limb@jcomserv.net>
Date: Oct 07 2010 19:23:10 +0000
Subject: 3.1


---

diff --git a/.gitignore b/.gitignore
index 8ab1d9e..f42c19b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 distcc-2.18.3.tar.bz2
+/distcc-3.1.tar.bz2
diff --git a/distcc.spec b/distcc.spec
index 4c64cea..b9d0270 100644
--- a/distcc.spec
+++ b/distcc.spec
@@ -1,15 +1,19 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+# eval to 2.3 if python isn't yet present, workaround for no python in fc4 minimal buildroot
+%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")}
+
 
 Name:       distcc
-Version:    2.18.3
-Release:    6%{?dist}
+Version:    3.1
+Release:    1%{?dist}
 Summary:    Distributed C/C++ compilation
 Group:      Development/Tools
 License:    GPLv2+
-URL:        http://distcc.samba.org/
-Source0:    http://distcc.samba.org/ftp/distcc/distcc-%{version}.tar.bz2
+URL:        http://distcc.org/
+Source0:    http://distcc.googlecode.com/files/distcc-%{version}.tar.bz2
 Source1:    hosts.sample
 Source2:    distccd.init
-Patch0:     distcc-2.18.3-avahi.patch
+#Patch0:     distcc-2.18.3-avahi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: popt-devel
@@ -42,11 +46,11 @@ This package contains the compilation server needed to use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .avahi
+#%patch0 -p1 -b .avahi
 
 
 %build
-%configure --with-gnome --with-docdir=%{_datadir}/doc/%{name}-%{version}
+%configure --with-gnome --with-docdir=%{_datadir}/doc/%{name}-%{version} --disable-Werror
 make %{?_smp_mflags}
 
 
@@ -94,6 +98,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/doc/%{name}-%{version}
 %{_bindir}/distcc
 %{_bindir}/distccmon*
+%{_bindir}/lsdistcc
+%{_bindir}/pump
 %{_mandir}/man1/distcc.*
 %{_mandir}/man1/distccmon*
 %{_datadir}/%{name}
@@ -107,11 +113,18 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING README
 %{_bindir}/distccd
 %{_sysconfdir}/init.d/*
+%{_sysconfdir}/default/distcc
+%{_sysconfdir}/distcc/*allow*
 %{_mandir}/man1/distccd*
+%{_mandir}/man1/include_server*
+%{_mandir}/man1/pump*
 %config(noreplace) %{_sysconfdir}/sysconfig/distccd
-
+%{python_sitearch}/include_server*
 
 %changelog
+* Thu Oct 07 2010 Jon Ciesla <limb@jcomserv.net> - 3.1-1
+- New upstream, BZ 641032.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.18.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 04f36e9..600a277 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d6b80a1efc3a3d816c4f4175f63eaa2  distcc-2.18.3.tar.bz2
+a1a9d3853df7133669fffec2a9aab9f3  distcc-3.1.tar.bz2