[openstack-savanna] 2014.1.b3

[matt]

commit 19d32bc800b24c2ab63e4bc44ec62eeabc0d9e3c
Author: Matthew Farrellee <matt at redhat.com>
Date:   Fri Mar 14 14:50:42 2014 -0400

    2014.1.b3

 .gitignore             |    1 +
 openstack-savanna.spec |   23 +++++++++++++----------
 sources                |    2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 45f33ab..90b1104 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /savanna-0.3.tar.gz
 /savanna-2014.1.b1.tar.gz
 /savanna-2014.1.b2.tar.gz
+/savanna-2014.1.b3.tar.gz
diff --git a/openstack-savanna.spec b/openstack-savanna.spec
index 46edd59..401096e 100644
--- a/openstack-savanna.spec
+++ b/openstack-savanna.spec
@@ -1,6 +1,6 @@
 Name:          openstack-savanna
-Version:       2014.1.b2
-Release:       3%{?dist}
+Version:       2014.1.b3
+Release:       1%{?dist}
 Summary:       Apache Hadoop cluster management on OpenStack
 License:       ASL 2.0
 URL:           https://launchpad.net/savanna
@@ -25,20 +25,19 @@ Requires: python-eventlet
 Requires: python-flask
 Requires: python-iso8601
 Requires: python-jsonschema >= 1.3.0
-#?kombu>=2.4.8?
 Requires: python-oslo-config >= 1.2.0
-# >=1.8.0 needed for new namespace code (connect w/ sock param)
-Requires: python-paramiko >= 1.8.0
+Requires: python-oslo-messaging
+Requires: python-paramiko >= 1.9.0
 Requires: python-pbr
 Requires: python-cinderclient >= 1.0.5
-Requires: python-keystoneclient >= 0.3.2
+Requires: python-keystoneclient >= 0.6.0
 Requires: python-novaclient >= 2.15.0
 Requires: python-swiftclient
 Requires: python-neutronclient
 Requires: python-six >= 1.4.1
-Requires: python-stevedore >= 0.13
+Requires: python-stevedore >= 0.14
 Requires: python-sqlalchemy
-#?WebOb>=1.2.3?
+Requires: python-webob >= 1.2.3
 
 Requires(post):   systemd
 Requires(preun):  systemd
@@ -57,7 +56,7 @@ 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
+sed -i 's,etc/savanna/\*,etc/savanna/savanna.conf.sample,' setup.cfg
 
 
 %build
@@ -65,6 +64,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)
+# make doc build compatible with python-oslo-sphinx RPM
+sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
 sphinx-build doc/source html
 rm -rf html/.{doctrees,buildinfo}
 
@@ -134,7 +135,6 @@ exit 0
 # Note: permissions on savanna's home are intentially 0700
 %dir %{_datadir}/savanna
 %{_datadir}/savanna/savanna.conf.sample
-%{_datadir}/savanna/savanna.conf.sample-full
 %{python_sitelib}/savanna
 %{python_sitelib}/savanna-%{version}-py?.?.egg-info
 %defattr(-,savanna,savanna,-)
@@ -143,6 +143,9 @@ exit 0
 
 
 %changelog
+* Mon Mar 10 2014 Matthew Farrellee <matt at redhat> - 2014.1.b3-1
+- 2014.1.b3 release
+
 * Mon Jan 27 2014 Matthew Farrellee <matt at redhat> - 2014.1.b2-3
 - Require stevedore >= 0.13
 
diff --git a/sources b/sources
index 9638cd5..a0152bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-73231565118a940f85125e06e5571838  savanna-2014.1.b2.tar.gz
+1f4fa0e55018cce69254e97d85ee76b9  savanna-2014.1.b3.tar.gz