[python-heatclient] Updated patches from master-patches

[Jeff Peeler]

commit d244f152faa73c75699e0591e08a97757fcc821e
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Tue Dec 10 01:38:07 2013 -0500

    Updated patches from master-patches

 0001-Nuke-pbr-requirements-handling.patch          |   36 ++++++++++---------
 0002-Remove-runtime-dependency-on-python-pbr.patch |   22 ++++++++++++
 python-heatclient.spec                             |    2 +
 3 files changed, 43 insertions(+), 17 deletions(-)
---
diff --git a/0001-Nuke-pbr-requirements-handling.patch b/0001-Nuke-pbr-requirements-handling.patch
index 7a7969b..8aaf231 100644
--- a/0001-Nuke-pbr-requirements-handling.patch
+++ b/0001-Nuke-pbr-requirements-handling.patch
@@ -1,56 +1,58 @@
-From 884051a74c35a1554373d0b52f68347cec7e4ab6 Mon Sep 17 00:00:00 2001
+From 3b64f761d0eaccb4fe3638191c89627e8446b9db Mon Sep 17 00:00:00 2001
 From: Jakub Ruzicka <jruzicka at redhat.com>
 Date: Mon, 16 Sep 2013 17:25:48 +0200
 Subject: [PATCH] Nuke pbr requirements handling
 
 ---
- requirements.txt      |  7 -------
+ requirements.txt      |  8 --------
  setup.py              |  1 -
- test-requirements.txt | 14 --------------
- 3 files changed, 22 deletions(-)
+ test-requirements.txt | 15 ---------------
+ 3 files changed, 24 deletions(-)
  delete mode 100644 requirements.txt
  delete mode 100644 test-requirements.txt
 
 diff --git a/requirements.txt b/requirements.txt
 deleted file mode 100644
-index a7bdcf3..0000000
+index 6947270..0000000
 --- a/requirements.txt
 +++ /dev/null
-@@ -1,7 +0,0 @@
+@@ -1,8 +0,0 @@
 -pbr>=0.5.21,<1.0
 -argparse
 -httplib2
--iso8601>=0.1.4
+-iso8601>=0.1.8
 -PrettyTable>=0.6,<0.8
--python-keystoneclient>=0.3.0
+-python-keystoneclient>=0.4.1
 -PyYAML>=3.1.0
+-six>=1.4.1
 diff --git a/setup.py b/setup.py
-index 2a0786a..afab729 100755
+index 70c2b3f..afab729 100755
 --- a/setup.py
 +++ b/setup.py
 @@ -18,5 +18,4 @@
  import setuptools
  
  setuptools.setup(
--    setup_requires=['pbr>=0.5.21,<1.0'],
+-    setup_requires=['pbr'],
      pbr=True)
 diff --git a/test-requirements.txt b/test-requirements.txt
 deleted file mode 100644
-index 36d7158..0000000
+index 121780d..0000000
 --- a/test-requirements.txt
 +++ /dev/null
-@@ -1,14 +0,0 @@
+@@ -1,15 +0,0 @@
 -# Install bounded pep8/pyflakes first, then let flake8 install
 -pep8==1.4.5
--pyflakes==0.7.2
+-pyflakes>=0.7.2,<0.7.4
 -flake8==2.0
--hacking>=0.5.6,<0.7
+-hacking>=0.8.0,<0.9
 -coverage>=3.6
 -discover
--fixtures>=0.3.12
--mock>=0.8.0
+-fixtures>=0.3.14
+-mock>=1.0
 -mox>=0.5.3
+-mox3>=0.7.0
 -sphinx>=1.1.2
--testscenarios>=0.4,<0.5
+-testscenarios>=0.4
 -testrepository>=0.0.17
 -testtools>=0.9.32
diff --git a/0002-Remove-runtime-dependency-on-python-pbr.patch b/0002-Remove-runtime-dependency-on-python-pbr.patch
new file mode 100644
index 0000000..ca746a2
--- /dev/null
+++ b/0002-Remove-runtime-dependency-on-python-pbr.patch
@@ -0,0 +1,22 @@
+From 517b9f1963ea7446b34588bd546c7eea0a3e7c1a Mon Sep 17 00:00:00 2001
+From: Jeff Peeler <jpeeler at redhat.com>
+Date: Tue, 10 Dec 2013 01:37:42 -0500
+Subject: [PATCH] Remove runtime dependency on python-pbr
+
+---
+ heatclient/__init__.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/heatclient/__init__.py b/heatclient/__init__.py
+index e589bb4..25b68fa 100644
+--- a/heatclient/__init__.py
++++ b/heatclient/__init__.py
+@@ -10,7 +10,4 @@
+ #   License for the specific language governing permissions and limitations
+ #   under the License.
+ 
+-import pbr.version
+-
+-
+-__version__ = pbr.version.VersionInfo('python-heatclient').version_string()
++__version__ = "REDHATHEATCLIENTVERSION"
diff --git a/python-heatclient.spec b/python-heatclient.spec
index a31456c..da77933 100644
--- a/python-heatclient.spec
+++ b/python-heatclient.spec
@@ -12,6 +12,7 @@ Source0:	http://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
 # patches_base=0.2.6
 #
 Patch0001: 0001-Nuke-pbr-requirements-handling.patch
+Patch0002: 0002-Remove-runtime-dependency-on-python-pbr.patch
 
 BuildArch:	noarch
 
@@ -50,6 +51,7 @@ This package contains auto-generated documentation.
 %setup -q
 
 %patch0001 -p1
+%patch0002 -p1
 
 # Remove the requirements file so that pbr hooks don't add it
 # to distutils requires_dist config.