[openstack-savanna] Intermediate version, allows for build from sdist of master

[matt]

commit d1dd13945c5e6455f0016a3cc4071a67aea137b0
Author: Matthew Farrellee <matt at redhat.com>
Date:   Thu Sep 12 08:48:14 2013 -0400

    Intermediate version, allows for build from sdist of master

 openstack-savanna.spec |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/openstack-savanna.spec b/openstack-savanna.spec
index 7a1b905..f6d2f39 100644
--- a/openstack-savanna.spec
+++ b/openstack-savanna.spec
@@ -1,10 +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.a195.g6699fe9
-Release:       1%{?dist}
+Version:       0.3
+Release:       0.1%{?master}%{?dist}
 Summary:       Apache Hadoop cluster management on OpenStack
 License:       ASL 2.0
 URL:           https://launchpad.net/savanna
-Source0:       http://tarballs.openstack.org/savanna/savanna-%{version}.tar.gz
+# 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
 Source1:       openstack-savanna-api.service
 BuildArch:     noarch
 
@@ -43,7 +50,7 @@ clusters on OpenStack.
 
 
 %prep
-%setup -q -n savanna-%{version}
+%setup -q -n savanna-%{version}%{?master}
 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
@@ -114,6 +121,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-db-manage
 %{_unitdir}/openstack-savanna-api.service
 %dir %attr(-, savanna, savanna) %{_sharedstatedir}/savanna
@@ -122,7 +130,7 @@ exit 0
 %{_datadir}/savanna/savanna.conf.sample
 %{_datadir}/savanna/savanna.conf.sample-full
 %{python_sitelib}/savanna
-%{python_sitelib}/savanna-%{version}-py?.?.egg-info
+%{python_sitelib}/savanna-%{version}%{?master}-py?.?.egg-info
 
 
 %changelog