[buildbot] Upgrade to 0.8.x Add -master and -slave subpackages Split html docs in own package

Mon Jun 27 10:36:50 UTC 2011

commit 84255be122d811e069a7c4ee4bfa38abfbf643e4
Author: Gianluca Sforna <giallu at gmail.com>
Date:   Mon Jun 27 12:36:26 2011 +0200

    Upgrade to 0.8.x
    Add -master and -slave subpackages
    Split html docs in own package

 .gitignore    |    2 +
 buildbot.spec |  119 +++++++++++++++++++++++++++++++++++++++++++++++----------
 sources       |    3 +-
 3 files changed, 103 insertions(+), 21 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 372f295..3509a14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 buildbot-0.7.12.tar.gz
+/buildbot-0.8.4p1.tar.gz
+/buildbot-slave-0.8.4.tar.gz
diff --git a/buildbot.spec b/buildbot.spec
index 7c1136a..21b85db 100644
--- a/buildbot.spec
+++ b/buildbot.spec
@@ -1,21 +1,25 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%global do_tests 0
+%global do_tests 1
+
+%global slaveversion 0.8.4
 
 Name:           buildbot
-Version:        0.7.12
-Release:        6%{?dist}
-Summary:        Build/test automation system
+Version:        0.8.4p1
+Release:        1%{?dist}
 
+Summary:        Build/test automation system
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://buildbot.net
-Source0:        http://pypi.python.org/packages/source/b/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://buildbot.googlecode.com/files/%{name}-%{version}.tar.gz
+Source1:        http://buildbot.googlecode.com/files/%{name}-slave-%{slaveversion}.tar.gz   
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  python-devel
+BuildRequires:  texinfo
 
 # Needed for tests
 %if %do_tests
@@ -39,70 +43,128 @@ BuildRequires:  subversion
 BuildRequires:  tla
 %endif
 
+# Turns former package into a metapackage for installing everything
+Requires:       %{name}-master = %{version}
+Requires:       %{name}-doc = %{version}
+Requires:       %{name}-slave = %{slaveversion}
+
+
+%description
+The BuildBot is a system to automate the compile/test cycle required by
+most software projects to validate code changes. By automatically
+rebuilding and testing the tree each time something has changed, build
+problems are pinpointed quickly, before other developers are
+inconvenienced by the failure.
+
+
+%package master
+Summary:        Build/test automation system
+Group:          Development/Tools
+License:        GPLv2
+
 Requires:       python-twisted-core
 Requires:       python-twisted-web
 Requires:       python-twisted-mail
 Requires:       python-twisted-words
 Requires:       python-twisted-conch
 Requires:       python-boto
+Requires:       python-jinja2
+Requires:       python-sqlalchemy
+Requires:       python-migrate
 
 Requires(post): info
 Requires(preun): info
 
 
-%description
+%description master
 The BuildBot is a system to automate the compile/test cycle required by
 most software projects to validate code changes. By automatically
 rebuilding and testing the tree each time something has changed, build
 problems are pinpointed quickly, before other developers are
 inconvenienced by the failure.
 
+This package contains only the buildmaster implementation.
+The buildbot-slave package contains the buildslave.
+
+
+%package slave
+Version:        %{slaveversion}   
+Summary:        Build/test automation system
+Group:          Development/Tools
+License:        GPLv2
+
+%description slave
+This package contains only the buildslave implementation.
+The buildbot-master package contains the buildmaster.
+
+
+%package doc
+Summary:    Buildbot documentation
+Group:      Documentation
+
+%description doc
+Buildbot documentation
+
+
 %prep
+%setup -q -b 1 -n %{name}-slave-%{slaveversion}
 %setup -q
 
 
 %build
 %{__python} setup.py build
 
+#TODO create API documentation
+pushd docs
+make buildbot.info docs.tgz
+popd
+
+pushd ../%{name}-slave-%{slaveversion}
+%{__python} setup.py build
+popd
+
+
 %if %do_tests
 %check
 trial buildbot.test
 %endif
 
-#TODO create API documentation, see docs/gen-reference for details
-
 
 %install
 rm -rf %{buildroot}
 
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
-mkdir -p %{buildroot}/%{_datadir}/%{name}/ \
-         %{buildroot}/%{_infodir}
+mkdir -p %{buildroot}%{_datadir}/%{name}/ \
+         %{buildroot}%{_infodir} \
+         %{buildroot}%{_docdir}/%{name}-%{version}
 
 cp -R contrib %{buildroot}/%{_datadir}/%{name}/
+
 # install texinfo files, see BZ#694199
 mv docs/buildbot.info* %{buildroot}/%{_infodir}
 
+# install HTML documentation
+tar xf docs/docs.tgz --strip-components=1 -C %{buildroot}%{_docdir}/%{name}-%{version}
+
 # clean up Windows contribs.
 sed -i 's/\r//' %{buildroot}/%{_datadir}/%{name}/contrib/windows/*
 chmod -x %{buildroot}/%{_datadir}/%{name}/contrib/windows/*
 
-# Fix rpmlint E: non-executable-script
-chmod +x %{buildroot}%{python_sitelib}/buildbot/test/subdir/emit.py
+# install slave files
+cd ../%{name}-slave-%{slaveversion}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
-# Fix rpmlint E: script-without-shebang
-sed -i '1i#!/usr/bin/python' %{buildroot}%{_datadir}/%{name}/contrib/bzr_buildbot.py
+# fix rpmlint E: script-without-shebang
+sed -i '1i#!/usr/bin/python' %{buildroot}%{_datadir}/%{name}/contrib/bk_buildbot.py
 
-# Fix rpmlint W: spurious-executable-perm
-rm docs/gen-reference
 
 
-%post
+%post master
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 
-%preun
+%preun master
 if [ $1 = 0 ] ; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
@@ -112,15 +174,32 @@ fi
 rm -rf %{buildroot}
 
 %files
+
+%files master
 %defattr(-,root,root,-)
-%doc COPYING CREDITS NEWS README docs/
+%doc COPYING CREDITS NEWS README UPGRADING
 %{_bindir}/buildbot
 %{python_sitelib}/*
 %{_datadir}/%{name}
 %{_infodir}/buildbot.info*
 
+%files slave
+%doc COPYING NEWS README UPGRADING
+%defattr(-,root,root,-)
+%{_bindir}/buildslave
+
+%files doc
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}
+
+
 
 %changelog
+* Wed Jun 22 2011 Gianluca Sforna <giallu at gmail.com> - 0.8.4p1-1
+- Upgrade to 0.8.x
+- Add -master and -slave subpackages
+- Split html docs in own package
+
 * Mon May 30 2011 Gianluca Sforna <giallu at gmail.com> - 0.7.12-6
 - Properly install texinfo files #694199
 - Disable tests for now, need to investigate some failures
@@ -205,7 +284,7 @@ rm -rf %{buildroot}
 - don't ghost pyo files
 
 * Fri Jul 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.7.3-3
-- move contribs to %%{_datadir}/%{name}
+- move contribs to %%{_datadir}/%%{name}
 
 * Fri Jul 07 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.7.3-2
 - fixes for review
diff --git a/sources b/sources
index 5068e49..f409551 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-5ba9559e2ef0d4e34a26815d95fc2d68  buildbot-0.7.12.tar.gz
+2ff4c922ff5787e27aaa9389dcfbbf8b  buildbot-slave-0.8.4.tar.gz
+8d23d88d6804570dfc5d13c5e7d666cd  buildbot-0.8.4p1.tar.gz
