[buildbot] Fix FTBFS due to changes in sphinx and twisted (#1106019)

[Yaakov Selkowitz]

commit ff2451e27a9080b2ec09206950f3351ca98e4e86
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Tue Jun 24 18:45:17 2014 -0500

    Fix FTBFS due to changes in sphinx and twisted (#1106019)

 buildbot-0.8.8-sphinx-build.patch |   13 +++++++++++++
 buildbot-0.8.8-tests.patch        |   12 ++++++++++++
 buildbot.spec                     |   20 ++++++++++----------
 3 files changed, 35 insertions(+), 10 deletions(-)
---
diff --git a/buildbot-0.8.8-sphinx-build.patch b/buildbot-0.8.8-sphinx-build.patch
new file mode 100644
index 0000000..cbb91fd
--- /dev/null
+++ b/buildbot-0.8.8-sphinx-build.patch
@@ -0,0 +1,13 @@
+Upstream commit a6903f0
+
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -134,7 +134,7 @@ html_logo = os.path.join('_images', 'header-text-transparent.png')
+ # The name of an image file (within the static path) to use as favicon of the
+ # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+ # pixels large.
+-html_favicon = 'buildbot.ico'
++html_favicon = os.path.join('_static', 'buildbot.ico')
+ 
+ # Add any paths that contain custom static files (such as style sheets) here,
+ # relative to this directory. They are copied after the builtin static files,
diff --git a/buildbot-0.8.8-tests.patch b/buildbot-0.8.8-tests.patch
new file mode 100644
index 0000000..a59e430
--- /dev/null
+++ b/buildbot-0.8.8-tests.patch
@@ -0,0 +1,12 @@
+Upstream commit de8da86
+
+--- a/buildbot/test/unit/test_buildslave_libvirt.py
++++ b/buildbot/test/unit/test_buildslave_libvirt.py
+@@ -38,6 +38,7 @@ class TestLibVirtSlave(unittest.TestCase):
+         self.assertRaises(config.ConfigErrors, self.ConcreteBuildSlave,
+             'bot', 'pass', None, 'path', 'path')
+ 
++    @defer.inlineCallbacks
+     def test_constructor_minimal(self):
+         bs = self.ConcreteBuildSlave('bot', 'pass', self.conn, 'path', 'otherpath')
+         yield bs._find_existing_deferred
diff --git a/buildbot.spec b/buildbot.spec
index c6d1c53..71cbaf1 100644
--- a/buildbot.spec
+++ b/buildbot.spec
@@ -9,7 +9,7 @@
 
 Name:           buildbot
 Version:        0.8.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Build/test automation system
 Group:          Development/Tools
@@ -17,8 +17,10 @@ License:        GPLv2
 URL:            http://buildbot.net
 Source0:        http://buildbot.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:        http://buildbot.googlecode.com/files/%{name}-slave-%{slaveversion}.tar.gz   
+# upstream patches
+Patch0:         buildbot-0.8.8-sphinx-build.patch
+Patch1:         buildbot-0.8.8-tests.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  python-devel
@@ -119,6 +121,8 @@ Buildbot documentation
 %prep
 %setup -q -b 1 -n %{name}-slave-%{slaveversion}
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -141,8 +145,6 @@ trial buildbot.test
 
 
 %install
-rm -rf %{buildroot}
-
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 mkdir -p %{buildroot}%{_datadir}/%{name}/ \
@@ -169,13 +171,9 @@ cd ../%{name}-slave-%{slaveversion}
 sed -i '1i#!/usr/bin/python' %{buildroot}%{_datadir}/%{name}/contrib/bk_buildbot.py
 
 
-%clean
-rm -rf %{buildroot}
-
 %files
 
 %files master
-%defattr(-,root,root,-)
 %doc COPYING CREDITS NEWS README UPGRADING
 %doc %{_mandir}/man1/buildbot.1.gz
 %{_bindir}/buildbot
@@ -185,17 +183,19 @@ rm -rf %{buildroot}
 
 %files slave
 %doc COPYING NEWS README UPGRADING
-%defattr(-,root,root,-)
 %{_bindir}/buildslave
 %{python_sitelib}/buildslave
 %{python_sitelib}/buildbot_slave-*egg-info
 
 %files doc
-%defattr(-,root,root,-)
 %{_pkgdocdir}
 
 
 %changelog
+* Tue Jun 24 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 0.8.8-3
+- Fix FTBFS due to changes in sphinx and twisted (#1106019)
+- Cleanup spec
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild