[openstack-savanna] 0.3.rc3

[matt]

commit d95315cb21d43955435e2f62dfa91e02bf5ad941
Author: Matthew Farrellee <matt at redhat.com>
Date:   Fri Oct 11 13:12:16 2013 -0400

    0.3.rc3

 openstack-savanna.spec |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/openstack-savanna.spec b/openstack-savanna.spec
index f6d2f39..c47e2ab 100644
--- a/openstack-savanna.spec
+++ b/openstack-savanna.spec
@@ -1,23 +1,17 @@
-# NOTE - sdist only, don't bother trying builds from git until pbr supports them
-
-%define master .a251.gfe5b782
-
 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.service
 BuildArch:     noarch
 
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
-BuildRequires: python-sphinx
+BuildRequires: python-oslo-sphinx
 BuildRequires: python-sphinxcontrib-httpdomain
 BuildRequires: python-pbr >= 0.5.19
 # Need systemd-units for _unitdir macro
@@ -50,7 +44,9 @@ clusters on OpenStack.
 
 
 %prep
-%setup -q -n savanna-%{version}%{?master}
+%setup -q -n savanna-%{version}%{?suf}
+rm -rf savanna.egg-info
+rm -f {test-,}requirements.txt
 sed -i 's/0.5.21/0.5.19/' setup.py
 # The data_files glob appears broken in pbr 0.5.19, so be explicit
 sed -i 's,etc/savanna/\*,etc/savanna/savanna.conf.sample etc/savanna/savanna.conf.sample-full,' setup.cfg
@@ -84,8 +80,8 @@ sed -i -e "s,^connection=.*,connection=sqlite:///$HOME/savanna-server.db," $CONF
 rm -rf %{buildroot}%{python_sitelib}/savanna/tests
 
 
-#%check
-#%{__python} setup.py test
+#%%check
+#%%{__python} setup.py test
 
 
 %pre
@@ -121,7 +117,7 @@ exit 0
 # 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
 %{_unitdir}/openstack-savanna-api.service
 %dir %attr(-, savanna, savanna) %{_sharedstatedir}/savanna
@@ -130,10 +126,13 @@ exit 0
 %{_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
 
 
 %changelog
+* Fri Oct 11 2013 Matthew Farrellee <matt at redhat> - 0.3-0.2
+- 0.3 rc3 build
+
 * Mon Aug 12 2013 Matthew Farrellee <matt at redhat> - 0.2-3
 - Updates to build on F19,
 -  Require systemd-units, allows mockbuild to work