[openstack-heat] Rebase to havana-rc2

[Jeff Peeler]

commit 4751fc5276bde08bebf75b5cddf12e6a53f396aa
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Mon Oct 14 14:30:34 2013 -0400

    Rebase to havana-rc2
    
    Also remove pbr runtime dependency

 .gitignore                          |    1 +
 openstack-heat.spec                 |   12 ++++++++++--
 remove-pbr-runtime-dependency.patch |   21 +++++++++++++++++++++
 sources                             |    2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 378fd7d..769fc4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /heat-2013.2.b2.tar.gz
 /heat-2013.2.b3.tar.gz
 /heat-2013.2.rc1.tar.gz
+/heat-2013.2.rc2.tar.gz
diff --git a/openstack-heat.spec b/openstack-heat.spec
index 9d9c6a3..7b6e8f1 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -1,6 +1,6 @@
 %global release_name havana
 %global release_letter rc
-%global milestone 1
+%global milestone 2
 %global full_release heat-%{version}.%{release_letter}%{milestone}
 
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
@@ -24,6 +24,7 @@ Source5:	openstack-heat-api-cloudwatch.service
 Source20:   heat-dist.conf
 
 Patch0: switch-to-using-m2crypto.patch
+Patch1: remove-pbr-runtime-dependency.patch
 
 BuildArch: noarch
 BuildRequires: git
@@ -72,6 +73,10 @@ Requires: %{name}-api-cloudwatch = %{version}-%{release}
 %prep
 %setup -q -n %{full_release}
 %patch0 -p1
+%patch1 -p1
+
+sed -i s/REDHATHEATVERSION/%{version}/ heat/version.py
+sed -i s/REDHATHEATRELEASE/%{release}/ heat/version.py
 
 # Remove the requirements file so that pbr hooks don't add it
 # to distutils requires_dist config
@@ -200,7 +205,6 @@ Requires: python-anyjson
 Requires: python-paramiko
 Requires: python-heatclient
 Requires: python-babel
-Requires: python-pbr
 
 Requires(pre): shadow-utils
 
@@ -374,6 +378,10 @@ AWS CloudWatch-compatible API to the Heat Engine
 
 
 %changelog
+* Mon Oct 14 2013 Jeff Peeler <jpeeler at redhat.com> 2013.2-0.9.rc2
+- rebase to havana-rc2
+- remove pbr dependency
+
 * Thu Oct 3 2013 Jeff Peeler <jpeeler at redhat.com> 2013.2-0.9.rc1
 - update to rc1
 - exclude doc builds if with_doc 0
diff --git a/remove-pbr-runtime-dependency.patch b/remove-pbr-runtime-dependency.patch
new file mode 100644
index 0000000..46cecd1
--- /dev/null
+++ b/remove-pbr-runtime-dependency.patch
@@ -0,0 +1,21 @@
+diff --git a/heat/version.py b/heat/version.py
+index a717606..8ea213a 100644
+--- a/heat/version.py
++++ b/heat/version.py
+@@ -14,6 +14,14 @@
+ #    under the License.
+ 
+ 
+-import pbr.version
++class VersionInfo(object):
++    release = 'REDHATHEATRELEASE'
++    version = 'REDHATHEATVERSION'
+ 
+-version_info = pbr.version.VersionInfo('heat')
++    def version_string(self):
++        return self.version
++
++    def release_string(self):
++        return self.release
++
++version_info = VersionInfo()
diff --git a/sources b/sources
index 649302a..651c38e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f389e18b4faa5f1ed1c7bf38fba4b20  heat-2013.2.rc1.tar.gz
+fcc7d36831cfc425915364e0f11293af  heat-2013.2.rc2.tar.gz