[buildbot] Fix #1199283 with patch from upstream

[Gianluca Sforna]

commit 299bb9473f838e6b523d4c75bed838c6f252ad22
Author: Gianluca Sforna <giallu at gmail.com>
Date:   Fri Mar 6 10:30:35 2015 +0100

    Fix #1199283 with patch from upstream

 buildbot-0.8.10-TypeError.patch | 12 ++++++++++++
 buildbot.spec                   | 10 +++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/buildbot-0.8.10-TypeError.patch b/buildbot-0.8.10-TypeError.patch
new file mode 100644
index 0000000..9a667f4
--- /dev/null
+++ b/buildbot-0.8.10-TypeError.patch
@@ -0,0 +1,12 @@
+Index: master/buildbot/status/web/slaves.py
+===================================================================
+--- a/master/buildbot/status/web/slaves.py
++++ b/master/buildbot/status/web/slaves.py
+@@ -115,6 +115,6 @@
+ 
+         try:
+-            max_builds = int(request.args.get('numbuilds')[0])
+-        except ValueError:
++            max_builds = int(request.args.get('numbuilds', ['10'])[0])
++        except (TypeError, ValueError):
+             max_builds = 10
diff --git a/buildbot.spec b/buildbot.spec
index eda4a6d..31ceb6a 100644
--- a/buildbot.spec
+++ b/buildbot.spec
@@ -9,7 +9,7 @@
 
 Name:           buildbot
 Version:        0.8.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Build/test automation system
 Group:          Development/Tools
@@ -18,6 +18,8 @@ URL:            http://buildbot.net
 Source0:        https://pypi.python.org/packages/source/b/%{name}/%{name}-%{version}.tar.gz
 Source1:        https://pypi.python.org/packages/source/b/%{name}-slave/%{name}-slave-%{slaveversion}.tar.gz   
 
+Patch0:         buildbot-0.8.10-TypeError.patch
+
 BuildArch:      noarch
 
 BuildRequires:  python-devel
@@ -34,8 +36,6 @@ BuildRequires:  python-twisted-web
 BuildRequires:  python-twisted-mail
 BuildRequires:  python-twisted-words
 
-# Lately, bzr tests fail. I contacted upstream about the issue
-# in the meanwhile they are disabled
 BuildRequires:  bzr 
 BuildRequires:  cvs
 BuildRequires:  git
@@ -118,6 +118,7 @@ Buildbot documentation
 %prep
 %setup -q -b 1 -n %{name}-slave-%{slaveversion}
 %setup -q
+%patch0 -p2
 
 
 %build
@@ -187,6 +188,9 @@ sed -i '1i#!/usr/bin/python' %{buildroot}%{_datadir}/%{name}/contrib/bk_buildbot
 
 
 %changelog
+* Thu Mar  5 2015 Gianluca Sforna <giallu at gmail.com> - 0.8.10-2
+* add patch from upstream for # 1199283
+
 * Fri Dec 19 2014 Gianluca Sforna <giallu at gmail.com> - 0.8.10-1
 - new upstream release
 - remove upstreamed patch