[openstack-swift/el6-havana] fix pbr requirements

[Pádraig Brady]

commit 21648ed4c0d41643ab88bad00d914e63a3c179d0
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Oct 9 15:33:46 2013 +0100

    fix pbr requirements
    
    Add BuildRequires for pbr and remove runtime requirements

 0003-remove-runtime-requirement-on-pbr.patch |   29 ++++++++++++++++++++++++++
 openstack-swift.spec                         |    3 ++
 2 files changed, 32 insertions(+), 0 deletions(-)
---
diff --git a/0003-remove-runtime-requirement-on-pbr.patch b/0003-remove-runtime-requirement-on-pbr.patch
new file mode 100644
index 0000000..79d8b9b
--- /dev/null
+++ b/0003-remove-runtime-requirement-on-pbr.patch
@@ -0,0 +1,29 @@
+From 70ea3d3678ed0fb6f14f0cb56528a76fd0cb8cdb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
+Date: Wed, 9 Oct 2013 12:38:40 +0100
+Subject: [PATCH] remove runtime requirement on pbr
+
+---
+ swift/__init__.py |    9 ++-------
+ 1 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/swift/__init__.py b/swift/__init__.py
+index 3a11a77..f3e324c 100644
+--- a/swift/__init__.py
++++ b/swift/__init__.py
+@@ -41,13 +41,8 @@ paste.__path__.insert(0, paste.__path__.pop(-1))
+ import os
+ import gettext
+ 
+-import pbr.version
+-
+-
+-_version_info = pbr.version.VersionInfo('swift')
+-__version__ = _version_info.release_string()
+-__canonical_version__ = _version_info.version_string()
+-
++__version__ = "%RPMVERSION%-%RPMRELEASE%"
++__canonical_version__ = "%RPMVERSION%"
+ 
+ _localedir = os.environ.get('SWIFT_LOCALEDIR')
+ _t = gettext.translation('swift', localedir=_localedir, fallback=True)
diff --git a/openstack-swift.spec b/openstack-swift.spec
index 2fc64ef..3a535c5 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -53,6 +53,7 @@ BuildRoot:        %{_tmppath}/swift-%{version}-%{release}-root-%(%{__id_u} -n)
 #
 Patch0001: 0001-Use-updated-parallel-install-versions-of-el6-package.patch
 Patch0002: 0002-Add-fixes-for-building-the-doc-package.patch
+Patch0003: 0003-remove-runtime-requirement-on-pbr.patch
 
 BuildArch:        noarch
 BuildRequires:    python-devel
@@ -60,6 +61,7 @@ BuildRequires:    python-setuptools
 BuildRequires:    python-netifaces
 # These are required to build due to the requirements check added
 BuildRequires:    python-paste-deploy1.5
+BuildRequires:    python-pbr
 
 Requires:         python-configobj
 Requires:         python-eventlet >= 0.9.15
@@ -166,6 +168,7 @@ This package contains documentation files for %{name}.
 
 %patch0001 -p1
 %patch0002 -p1
+%patch0003 -p1
 # Remove bundled egg-info
 rm -rf swift.egg-info
 # let RPM handle deps