rpms/buildbot/devel buildbot.spec,1.20,1.21

[Gianluca Sforna]

Author: giallu

Update of /cvs/extras/rpms/buildbot/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5005

Modified Files:
	buildbot.spec 
Log Message:
Fix FTBS and few other improvements



Index: buildbot.spec
===================================================================
RCS file: /cvs/extras/rpms/buildbot/devel/buildbot.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- buildbot.spec	22 Jul 2010 00:47:57 -0000	1.20
+++ buildbot.spec	22 Jul 2010 07:58:38 -0000	1.21
@@ -4,7 +4,7 @@
 
 Name:           buildbot
 Version:        0.7.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Build/test automation system
 
 Group:          Development/Tools
@@ -13,6 +13,7 @@ URL:            http://buildbot.net
 Source0:        http://pypi.python.org/packages/source/b/%{name}/%{name}-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
 
 BuildRequires:  python-devel
 
@@ -22,7 +23,6 @@ BuildRequires:  python-twisted-core
 BuildRequires:  python-twisted-web
 BuildRequires:  python-twisted-mail
 BuildRequires:  python-twisted-words
-BuildRequires:  bazaar
 BuildRequires:  bzr
 BuildRequires:  cvs
 %ifarch %{ix86} x86_64 ppc alpha
@@ -39,8 +39,8 @@ Requires:       python-twisted-core
 Requires:       python-twisted-web
 Requires:       python-twisted-mail
 Requires:       python-twisted-words
-
-BuildArch:      noarch
+Requires:       python-twisted-conch
+Requires:       python-boto
 
 
 %description
@@ -62,6 +62,9 @@ inconvenienced by the failure.
 trial buildbot.test
 %endif
 
+#TODO create API documentation, see docs/gen-reference for details
+
+
 %install
 rm -rf %{buildroot}
 
@@ -74,9 +77,16 @@ cp -R contrib %{buildroot}/%{_datadir}/%
 sed -i 's/\r//' %{buildroot}/%{_datadir}/%{name}/contrib/windows/*
 chmod -x %{buildroot}/%{_datadir}/%{name}/contrib/windows/*
 
-# Fix rpmlint error (non-executable-script)
+# Fix rpmlint E: non-executable-script
 chmod +x %{buildroot}%{python_sitelib}/buildbot/test/subdir/emit.py
 
+# Fix rpmlint E: script-without-shebang
+sed -i '1i#!/usr/bin/python' %{buildroot}%{_datadir}/%{name}/contrib/bzr_buildbot.py
+
+# Fix rpmlint W: spurious-executable-perm
+rm docs/gen-reference
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -89,9 +99,17 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jul 22 2010 Gianluca Sforna <giallu gmail com> - 0.7.12-3
+- Remove BR:bazaar (fixes FTBS)
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.7.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
+* Sun Feb  7 2010 Gianluca Sforna <giallu gmail com>
+- Require python-boto for EC2 support
+- Require python-twisted-conch for manhole support
+- Silence rpmlint
+
 * Fri Jan 22 2010 Gianluca Sforna <giallu gmail com> - 0.7.12-1
 - New upstream release