[buildbot] updating to bb 0.8.5 patched the source so that the docs would build properly also updated dependanc

Dan Radez radez at fedoraproject.org
Fri Dec 2 18:55:45 UTC 2011


commit 9b5dc7aaa2b7a0a5fa9169938068682451378a97
Author: Dan Radez <dradez at redhat.com>
Date:   Fri Dec 2 11:46:23 2011 -0500

    updating to bb 0.8.5
    patched the source so that the docs would build properly
    also updated dependancies to match the new docs in the project

 .gitignore    |    3 +++
 buildbot.spec |   34 ++++++++++++++--------------------
 sources       |    4 ++--
 3 files changed, 19 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3509a14..37522fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 buildbot-0.7.12.tar.gz
 /buildbot-0.8.4p1.tar.gz
 /buildbot-slave-0.8.4.tar.gz
+/buildbot-0.8.5.tar.gz
+/buildbot-slave-0.8.5.tar.gz
+/buildbot-0.8.5p1.tar.gz
diff --git a/buildbot.spec b/buildbot.spec
index 13734ad..59355dd 100644
--- a/buildbot.spec
+++ b/buildbot.spec
@@ -4,11 +4,11 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=601725
 %global do_tests 0
 
-%global slaveversion 0.8.4
+%global slaveversion 0.8.5
 
 Name:           buildbot
-Version:        0.8.4p1
-Release:        2%{?dist}
+Version:        0.8.5p1
+Release:        1%{?dist}
 
 Summary:        Build/test automation system
 Group:          Development/Tools
@@ -21,7 +21,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  python-devel
-BuildRequires:  texinfo
+BuildRequires:  python-sphinx
 
 # Needed for tests
 %if %do_tests
@@ -118,7 +118,7 @@ Buildbot documentation
 
 #TODO create API documentation
 pushd docs
-make buildbot.info docs.tgz
+make docs.tgz
 popd
 
 pushd ../%{name}-slave-%{slaveversion}
@@ -138,13 +138,13 @@ rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 mkdir -p %{buildroot}%{_datadir}/%{name}/ \
-         %{buildroot}%{_infodir} \
+         %{buildroot}%{_mandir}/man1/ \
          %{buildroot}%{_docdir}/%{name}-%{version}
 
 cp -R contrib %{buildroot}/%{_datadir}/%{name}/
 
-# install texinfo files, see BZ#694199
-mv docs/buildbot.info* %{buildroot}/%{_infodir}
+# install the man page
+cp docs/buildbot.1 %{buildroot}%{_mandir}/man1/buildbot.1
 
 # install HTML documentation
 tar xf docs/docs.tgz --strip-components=1 -C %{buildroot}%{_docdir}/%{name}-%{version}
@@ -161,17 +161,6 @@ cd ../%{name}-slave-%{slaveversion}
 sed -i '1i#!/usr/bin/python' %{buildroot}%{_datadir}/%{name}/contrib/bk_buildbot.py
 
 
-
-%post master
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
-
-
-%preun master
-if [ $1 = 0 ] ; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
-fi
-
-
 %clean
 rm -rf %{buildroot}
 
@@ -180,10 +169,10 @@ rm -rf %{buildroot}
 %files master
 %defattr(-,root,root,-)
 %doc COPYING CREDITS NEWS README UPGRADING
+%doc %{_mandir}/man1/buildbot.1.gz
 %{_bindir}/buildbot
 %{python_sitelib}/*
 %{_datadir}/%{name}
-%{_infodir}/buildbot.info*
 
 %files slave
 %doc COPYING NEWS README UPGRADING
@@ -197,6 +186,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 02 2011 Dan Radez <dan at radez.net> - 0.8.5p1-1
+- New Upstream Release
+- updated make for the docs
+- removed the buildbot.info refs added the man page
+
 * Wed Jun 22 2011 Gianluca Sforna <giallu at gmail.com> - 0.8.4p1-2
 - Upgrade to 0.8.x
 - Add -master and -slave subpackages
diff --git a/sources b/sources
index f409551..ae7a387 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2ff4c922ff5787e27aaa9389dcfbbf8b  buildbot-slave-0.8.4.tar.gz
-8d23d88d6804570dfc5d13c5e7d666cd  buildbot-0.8.4p1.tar.gz
+248250e73307e8ba7a1aaea3a90d94cf  buildbot-0.8.5p1.tar.gz
+0af8f60b4ede37878e9d3da25ec61bc3  buildbot-slave-0.8.5.tar.gz


More information about the scm-commits mailing list