[openstack-nova] Restore pbr patch dropped in the last version by mistake

[Xavier Queralt Mateu]

commit db152efaf1374c804730dd4f44e53c3d725ed583
Author: Xavier Queralt <xqueralt at redhat.com>
Date:   Fri Jan 24 11:17:46 2014 +0100

    Restore pbr patch dropped in the last version by mistake

 0002-remove-runtime-dep-on-python-pbr.patch        |   45 ++++++++++++++++++++
 ...03-libvirt-Fix-root-disk-leak-in-live-mig.patch |    2 +-
 openstack-nova.spec                                |    9 +++-
 3 files changed, 53 insertions(+), 3 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..277cfb6
--- /dev/null
+++ b/0002-remove-runtime-dep-on-python-pbr.patch
@@ -0,0 +1,45 @@
+From 63b7da8dd0d457f7fdd9ac7c907ea65f4ea0d627 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 01b6b47..25ea4dc 100644
+--- a/nova/version.py
++++ b/nova/version.py
+@@ -14,8 +14,6 @@
+ #    License for the specific language governing permissions and limitations
+ #    under the License.
+ 
+-import pbr.version
+-
+ from nova.openstack.common.gettextutils import _
+ 
+ NOVA_VENDOR = "OpenStack Foundation"
+@@ -23,7 +21,20 @@ 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/0002-libvirt-Fix-root-disk-leak-in-live-mig.patch b/0003-libvirt-Fix-root-disk-leak-in-live-mig.patch
similarity index 98%
rename from 0002-libvirt-Fix-root-disk-leak-in-live-mig.patch
rename to 0003-libvirt-Fix-root-disk-leak-in-live-mig.patch
index 7a2ba7c..478838e 100644
--- a/0002-libvirt-Fix-root-disk-leak-in-live-mig.patch
+++ b/0003-libvirt-Fix-root-disk-leak-in-live-mig.patch
@@ -1,4 +1,4 @@
-From 01f5d8a22f41ae1db0a6d2ffd5504876d64dfaba Mon Sep 17 00:00:00 2001
+From 1fd751699768c7ac60384612c2916cb891b3778c Mon Sep 17 00:00:00 2001
 From: Nikola Dipanov <ndipanov at redhat.com>
 Date: Tue, 10 Dec 2013 17:43:17 +0100
 Subject: [PATCH] libvirt: Fix root disk leak in live mig
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 7ee95db..a215b37 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-nova
 Version:          2014.1
-Release:          0.6.b2%{?dist}
+Release:          0.7.b2%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -38,7 +38,8 @@ Source30:         openstack-nova-novncproxy.sysconfig
 # patches_base=2014.1.b2
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
-Patch0002: 0002-libvirt-Fix-root-disk-leak-in-live-mig.patch
+Patch0002: 0002-remove-runtime-dep-on-python-pbr.patch
+Patch0003: 0003-libvirt-Fix-root-disk-leak-in-live-mig.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -397,6 +398,7 @@ This package contains documentation files for nova.
 
 %patch0001 -p1
 %patch0002 -p1
+%patch0003 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -865,6 +867,9 @@ fi
 %endif
 
 %changelog
+* Fri Jan 24 2014 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.7.b2
+- Restore pbr patch dropped in the last version by mistake
+
 * Fri Jan 24 2014 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.6.b2
 - Update to Icehouse milestone 2
 - Require python-keystoneclient for api-paste - rhbz#909113