[openstack-savanna/el6] 0.3.rc3 build

[matt]

commit 11bca3d81e1959fa402536b876f58c960cdbbe5e
Author: Matthew Farrellee <matt at redhat.com>
Date:   Fri Oct 11 15:25:49 2013 -0400

    0.3.rc3 build

 bug1223934-workaround.patch |   12 ------------
 openstack-savanna.spec      |   38 +++++++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 29 deletions(-)
---
diff --git a/openstack-savanna.spec b/openstack-savanna.spec
index 420dd2a..e344964 100644
--- a/openstack-savanna.spec
+++ b/openstack-savanna.spec
@@ -1,24 +1,19 @@
-%define master .a274.gabf778f
-
 Name:          openstack-savanna
 Version:       0.3
-Release:       0.1%{?master}%{?dist}
+%define suf    .rc3
+Release:       0.2%{?dist}
 Summary:       Apache Hadoop cluster management on OpenStack
 License:       ASL 2.0
 URL:           https://launchpad.net/savanna
-# For unreleased builds,
-#  curl -o savanna-%%{version}%%{master}.tar.gz http://tarballs.openstack.org/savanna/savanna-master.tar.gz
-Source0:       savanna-%{version}%{master}.tar.gz
-#Source0:       http://tarballs.openstack.org/savanna/savanna-%%{version}.tar.gz
+Source0:       http://tarballs.openstack.org/savanna/savanna-%{version}%{?suf}.tar.gz
 Source1:       openstack-savanna-api.init
 Patch0:        sqlalchemy0.7-magic.patch
-Patch1:        bug1223934-workaround.patch
 BuildArch:     noarch
 
 BuildRequires: python-pbr
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
-BuildRequires: python-sphinx10
+#BuildRequires: python-oslo-sphinx
 BuildRequires: python-sphinxcontrib-httpdomain
 # Needed by sqlalchemy0.7-magic.patch
 BuildRequires: python-sqlalchemy0.7
@@ -53,9 +48,8 @@ clusters on OpenStack.
 
 
 %prep
-%setup -q -n savanna-%{version}%{?master}
+%setup -q -n savanna-%{version}%{?suf}
 %patch0
-%patch1
 rm -rf savanna.egg-info
 rm -f {test-,}requirements.txt
 sed -i 's/0.5.21/0.5.19/' setup.py
@@ -68,8 +62,8 @@ sed -i 's,etc/savanna/\*,etc/savanna/savanna.conf.sample etc/savanna/savanna.con
 
 export PYTHONPATH=$PWD:${PYTHONPATH}
 # Note: json warnings likely resolved w/ pygments 1.5 (not yet in Fedora)
-sphinx-1.0-build doc/source html
-rm -rf html/.{doctrees,buildinfo}
+#sphinx-1.0-build doc/source html
+#rm -rf html/.{doctrees,buildinfo}
 
 
 %install
@@ -130,13 +124,14 @@ fi
 
 
 %files
-%doc html README.rst LICENSE
+#doc html README.rst LICENSE
+%doc README.rst LICENSE
 %dir %attr(0755, savanna, root) %{_localstatedir}/run/savanna
 %dir %{_sysconfdir}/savanna
 # Note: this file is not readable because it holds auth credentials
 %config(noreplace) %attr(-, root, savanna) %{_sysconfdir}/savanna/savanna.conf
 %{_bindir}/savanna-api
-%{_bindir}/savanna-subprocess
+%{_bindir}/_savanna-subprocess
 %{_bindir}/savanna-db-manage
 %{_initrddir}/openstack-savanna-api
 %dir %attr(-, savanna, savanna) %{_sharedstatedir}/savanna
@@ -145,10 +140,19 @@ fi
 %{_datadir}/savanna/savanna.conf.sample
 %{_datadir}/savanna/savanna.conf.sample-full
 %{python_sitelib}/savanna
-%{python_sitelib}/savanna-%{version}%{?master}-py?.?.egg-info
-
+%{python_sitelib}/savanna-%{version}%{?suf}-py?.?.egg-info
 
+#
+# TODO:
+#  . _savanna-subprocess should be in libexec
+#
 %changelog
+* Fri Oct 11 2013 Matthew Farrellee <matt at redhat> - 0.3-0.2
+- 0.3 rc3 build
+- Remove workaround patch for novaclient bug 1223934
+- Remove spec infrastructure for master branch build
+- Remove html generation until python-oslo-sphinx is available
+
 * Wed Sep 18 2013 Matthew Farrellee <matt at redhat> - 0.3-0.1.a274.gabf778f
 - Add workaround patch for novaclient bug 1223934