[openstack-sahara] adding patch to remove pbr runtime dep

[Michael McCune]

commit 1e066dd91e29e14d2ef797ff8c44fa46ac518c01
Author: Michael McCune <mimccune at redhat.com>
Date:   Mon May 5 12:37:40 2014 -0400

    adding patch to remove pbr runtime dep

 0001-remove-runtime-dep-on-python-pbr.patch |   22 ++++++++++++++++++++++
 openstack-sahara.spec                       |   16 ++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)
---
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
new file mode 100644
index 0000000..18127b4
--- /dev/null
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -0,0 +1,22 @@
+--- sahara/version.py	2014-05-05 09:18:09.682115488 -0400
++++ sahara/version.py	2014-05-05 09:34:46.248635372 -0400
+@@ -13,6 +13,17 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
+-from pbr import version
+ 
+-version_info = version.VersionInfo('sahara')
++class VersionInfo(object):
++    release = 'REDHAT_SAHARA_RELEASE'
++    version = 'REDHAT_SAHARA_VERSION'
++    package = 'sahara'
++
++    def version_string(self):
++        return self.version
++
++    def release_string(self):
++        return self.release
++
++
++version_info = VersionInfo()
diff --git a/openstack-sahara.spec b/openstack-sahara.spec
index d2f71fb..d6c336e 100644
--- a/openstack-sahara.spec
+++ b/openstack-sahara.spec
@@ -29,7 +29,7 @@
 
 Name:          openstack-sahara
 Version:       2014.1.0
-Release:       8%{?dist}
+Release:       10%{?dist}
 Provides:      openstack-savanna = %{version}-%{release}
 Obsoletes:     openstack-savanna <= 2014.1.b3-3
 Summary:       Apache Hadoop cluster management on OpenStack
@@ -38,6 +38,7 @@ URL:           https://launchpad.net/sahara
 Source0:       http://tarballs.openstack.org/sahara/sahara-%{tmp_upstream_version}.tar.gz
 Source1:       openstack-sahara-api.service
 Source2:       openstack-sahara-api.init
+Patch0001:     0001-remove-runtime-dep-on-python-pbr.patch
 BuildArch:     noarch
 
 BuildRequires: python2-devel
@@ -60,7 +61,6 @@ Requires: python-jsonschema >= 1.3.0
 Requires: python-oslo-config >= 1.2.0
 Requires: python-oslo-messaging
 Requires: python-paramiko >= 1.9.0
-Requires: python-pbr
 Requires: python-cinderclient >= 1.0.5
 Requires: python-keystoneclient >= 0.6.0
 Requires: python-novaclient >= 2.15.0
@@ -103,6 +103,11 @@ install, use, and manage the Sahara infrastructure.
 %prep
 %setup -q -n sahara-%{tmp_upstream_version}
 
+%patch0001 -p0
+
+sed -i s/REDHAT_SAHARA_VERSION/%{version}/ sahara/version.py
+sed -i s/REDHAT_SAHARA_RELEASE/%{release}/ sahara/version.py
+
 rm -rf sahara.egg-info
 rm -f test-requirements.txt
 # The data_files glob appears broken in pbr 0.5.19, so be explicit
@@ -243,6 +248,13 @@ fi
 
 
 %changelog
+* Mon May 05 2014 Michael McCune <mimccune at redhat> - 2014.1.0-10
+- Removing pbr from Requires
+- changing version and release temp from patch
+
+* Mon May 05 2014 Michael McCune <mimccune at redhat> - 2014.1.0-9
+- Adding patch to remove runtime pbr requirement
+
 * Fri May 02 2014 Michael McCune <mimccune at redhat> - 2014.1.0-8
 - Removing python-sqlalchemy and python-paste-deploy from BuildRequires
 - refactoring the systemd portions