[openstack-nova] Fix version_string issue

[Nikola Dipanov]

commit 0d0612f25bb32b345070db7aefb3a07ad1b6bc60
Author: Nikola Dipanov <ndipanov at redhat.com>
Date:   Fri Jun 14 10:50:37 2013 +0200

    Fix version_string issue

 ...emove-a-runtime-dep-on-python-pbr-package.patch |   63 --------------------
 0002-remove-runtime-dep-on-python-pbr.patch        |   43 +++++++++++++
 openstack-nova.spec                                |    8 ++-
 3 files changed, 49 insertions(+), 65 deletions(-)
---
diff --git a/0002-remove-runtime-dep-on-python-pbr.patch b/0002-remove-runtime-dep-on-python-pbr.patch
new file mode 100644
index 0000000..d9c5c82
--- /dev/null
+++ b/0002-remove-runtime-dep-on-python-pbr.patch
@@ -0,0 +1,43 @@
+From fbf64d97ae5c69f36e3fb04c980641fa77adc0f4 Mon Sep 17 00:00:00 2001
+From: Nikola Dipanov <ndipanov at redhat.com>
+Date: Fri, 14 Jun 2013 11:29:50 +0200
+Subject: [PATCH] remove runtime dep on python-pbr
+
+Change-Id: I6f247f64c561d49c13e3c2f67401fe150b6d47b6
+---
+ nova/version.py | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/nova/version.py b/nova/version.py
+index f954ef3..dcf3b7b 100644
+--- a/nova/version.py
++++ b/nova/version.py
+@@ -14,14 +14,25 @@
+ #    License for the specific language governing permissions and limitations
+ #    under the License.
+ 
+-import pbr.version
+-
+ NOVA_VENDOR = "OpenStack Foundation"
+ NOVA_PRODUCT = "OpenStack Nova"
+ NOVA_PACKAGE = None  # OS distro package version suffix
+ 
+ loaded = False
+-version_info = pbr.version.VersionInfo('nova')
++
++
++class VersionInfo(object):
++    release = "REDHATNOVARELEASE"
++    version = "REDHATNOVAVERSION"
++
++    def version_string(self):
++        return self.version
++
++    def release_string(self):
++        return self.release
++
++
++version_info = VersionInfo()
+ version_string = version_info.version_string
+ 
+ 
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 6c2970f..6882e83 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-nova
 Version:          2013.2
-Release:          0.2.h1%{?dist}
+Release:          0.3.h1%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -36,7 +36,7 @@ Source24:         nova-sudoers
 # patches_base=2013.2.b1
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
-Patch0002: 0002-Remove-a-runtime-dep-on-python-pbr-package.patch
+Patch0002: 0002-remove-runtime-dep-on-python-pbr.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -371,6 +371,7 @@ find nova -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
 
 sed -i '/setuptools_git/d' setup.py
 sed -i s/REDHATNOVAVERSION/%{version}/ nova/version.py
+sed -i s/REDHATNOVARELEASE/%{release}/ nova/version.py
 
 %build
 %{__python} setup.py build
@@ -795,6 +796,9 @@ fi
 %endif
 
 %changelog
+* Fri Jun 14 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.3.h1
+- Fix an issue with the version string
+
 * Mon Jun 10 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.2.h1
 - Add a runtime dep on python-six
 - Fix verision reporting