[python-keystoneclient] Remove pbr deps in the patch instead of spec file.

[Jakub Ruzicka]

commit 50a8d8e735884be0bae9c03f86c6af344d5f07e6
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Mon Sep 9 21:47:50 2013 +0200

    Remove pbr deps in the patch instead of spec file.

 0001-Remove-runtime-dependency-on-python-pbr.patch |   58 +++++++++++++++++++-
 python-keystoneclient.spec                         |    8 ++--
 2 files changed, 59 insertions(+), 7 deletions(-)
---
diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch
index 31a5780..0e78940 100644
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ b/0001-Remove-runtime-dependency-on-python-pbr.patch
@@ -1,11 +1,16 @@
-From 4720bdffa7709b37727efbe31f5d4edb83c59cee Mon Sep 17 00:00:00 2001
+From d80a6a235c120875acec623ae49eb0d258d55581 Mon Sep 17 00:00:00 2001
 From: Jakub Ruzicka <jruzicka at redhat.com>
 Date: Mon, 8 Jul 2013 15:22:05 +0200
 Subject: [PATCH] Remove runtime dependency on python-pbr.
 
 ---
- keystoneclient/__init__.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
+ keystoneclient/__init__.py |  5 +----
+ requirements.txt           |  9 ---------
+ setup.py                   |  1 -
+ test-requirements.txt      | 16 ----------------
+ 4 files changed, 1 insertion(+), 30 deletions(-)
+ delete mode 100644 requirements.txt
+ delete mode 100644 test-requirements.txt
 
 diff --git a/keystoneclient/__init__.py b/keystoneclient/__init__.py
 index d13c009..0fb852f 100644
@@ -20,3 +25,50 @@ index d13c009..0fb852f 100644
 -
 -__version__ = pbr.version.VersionInfo('python-keystoneclient').version_string()
 +__version__ = "REDHATKEYSTONECLIENTVERSION"
+diff --git a/requirements.txt b/requirements.txt
+deleted file mode 100644
+index c537876..0000000
+--- a/requirements.txt
++++ /dev/null
+@@ -1,9 +0,0 @@
+-pbr>=0.5.21,<1.0
+-argparse
+-iso8601>=0.1.4
+-PrettyTable>=0.6,<0.8
+-requests>=1.1
+-simplejson>=2.0.9
+-six
+-oslo.config>=1.1.0
+-netaddr
+diff --git a/setup.py b/setup.py
+index 2a0786a..afab729 100644
+--- a/setup.py
++++ b/setup.py
+@@ -18,5 +18,4 @@
+ import setuptools
+ 
+ setuptools.setup(
+-    setup_requires=['pbr>=0.5.21,<1.0'],
+     pbr=True)
+diff --git a/test-requirements.txt b/test-requirements.txt
+deleted file mode 100644
+index 2525fa8..0000000
+--- a/test-requirements.txt
++++ /dev/null
+@@ -1,16 +0,0 @@
+-hacking>=0.5.6,<0.7
+-
+-coverage>=3.6
+-discover
+-fixtures>=0.3.12
+-httpretty>=0.6.3
+-keyring>=1.6.1
+-mock>=0.8.0
+-mox>=0.5.3
+-pycrypto>=2.6
+-sphinx>=1.1.2
+-testrepository>=0.0.17
+-testtools>=0.9.32
+-WebOb>=1.2.3,<1.3
+-
+-Babel>=0.9.6
diff --git a/python-keystoneclient.spec b/python-keystoneclient.spec
index 30ed279..0035118 100644
--- a/python-keystoneclient.spec
+++ b/python-keystoneclient.spec
@@ -4,7 +4,7 @@ Name:       python-keystoneclient
 # https://lists.launchpad.net/openstack/msg14248.html
 Epoch:      1
 Version:    0.3.2
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Client library for OpenStack Identity API
 License:    ASL 2.0
 URL:        http://pypi.python.org/pypi/%{name}
@@ -61,9 +61,6 @@ sed -i s/REDHATKEYSTONECLIENTVERSION/%{version}/ keystoneclient/__init__.py
 
 # Remove bundled egg-info
 rm -rf python_keystoneclient.egg-info
-# Remove the requirements file so that pbr hooks don't add it
-# to distutils requiers_dist config.
-rm -rf {test-,}requirements.txt tools/{pip,test}-requires
 
 %build
 %{__python} setup.py build
@@ -93,6 +90,9 @@ rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
 %doc LICENSE doc/build/html
 
 %changelog
+* Mon Sep 09 2013 Jakub Ruzicka <jruzicka at redhat.com> 0.3.2-2
+- Remove pbr deps in the patch instead of this spec file.
+
 * Mon Sep 09 2013 Jakub Ruzicka <jruzicka at redhat.com> 0.3.2-1
 - Update to upstream 0.3.2.
 - Ec2Signer patch is included in this version.