[python-neutronclient/el6-havana] Remove pbr in a patch instead of spec file.

[Jakub Ruzicka]

commit 265edc2b2b1198d77039b208821e57efa9fed1ce
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Wed Aug 28 18:28:00 2013 +0200

    Remove pbr in a patch instead of spec file.

 0001-Remove-runtime-dependency-on-python-pbr.patch |   54 ++++++++++++++++++-
 python-neutronclient.spec                          |   11 ++--
 2 files changed, 56 insertions(+), 9 deletions(-)
---
diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch
index 375969e..c50917f 100644
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ b/0001-Remove-runtime-dependency-on-python-pbr.patch
@@ -1,11 +1,16 @@
-From c17f0b042d32c970afae6884a05c3df05642501f Mon Sep 17 00:00:00 2001
+From ce71a381eeb4316de01b4cc4ce04f756e4a4107a Mon Sep 17 00:00:00 2001
 From: Jakub Ruzicka <jruzicka at redhat.com>
 Date: Tue, 23 Jul 2013 18:35:38 +0200
 Subject: [PATCH] Remove runtime dependency on python-pbr.
 
 ---
- neutronclient/version.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
+ neutronclient/version.py |  5 +----
+ requirements.txt         |  6 ------
+ setup.py                 |  1 -
+ test-requirements.txt    | 15 ---------------
+ 4 files changed, 1 insertion(+), 26 deletions(-)
+ delete mode 100644 requirements.txt
+ delete mode 100644 test-requirements.txt
 
 diff --git a/neutronclient/version.py b/neutronclient/version.py
 index 9315671..f0b6efc 100644
@@ -20,3 +25,46 @@ index 9315671..f0b6efc 100644
 -
 -__version__ = pbr.version.VersionInfo('python-neutronclient').version_string()
 +__version__ = "REDHATNEUTRONCLIENTVERSION"
+diff --git a/requirements.txt b/requirements.txt
+deleted file mode 100644
+index fd898c0..0000000
+--- a/requirements.txt
++++ /dev/null
+@@ -1,6 +0,0 @@
+-pbr>=0.5.16,<0.6
+-argparse
+-cliff>=1.4
+-httplib2
+-iso8601>=0.1.4
+-simplejson>=2.0.9
+diff --git a/setup.py b/setup.py
+index 15f4e9d..afab729 100644
+--- a/setup.py
++++ b/setup.py
+@@ -18,5 +18,4 @@
+ import setuptools
+ 
+ setuptools.setup(
+-    setup_requires=['pbr>=0.5.20'],
+     pbr=True)
+diff --git a/test-requirements.txt b/test-requirements.txt
+deleted file mode 100644
+index 1089218..0000000
+--- a/test-requirements.txt
++++ /dev/null
+@@ -1,15 +0,0 @@
+-# Install bounded pep8/pyflakes first, then let flake8 install
+-pep8==1.4.5
+-pyflakes==0.7.2
+-flake8==2.0
+-hacking>=0.5.6,<0.7
+-
+-cliff-tablib>=1.0
+-coverage>=3.6
+-discover
+-fixtures>=0.3.12
+-mox>=0.5.3
+-python-subunit
+-sphinx>=1.1.2
+-testrepository>=0.0.17
+-testtools>=0.9.32
diff --git a/python-neutronclient.spec b/python-neutronclient.spec
index 8acf1dd..250d3fa 100644
--- a/python-neutronclient.spec
+++ b/python-neutronclient.spec
@@ -1,6 +1,6 @@
 Name:       python-neutronclient
 Version:    2.2.6
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Python API and CLI for OpenStack Neutron
 
 Group:      Development/Languages
@@ -9,7 +9,7 @@ URL:        http://launchpad.net/python-neutronclient/
 Source0:    https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 
 #
-# patches_base=2.2.4
+# patches_base=2.2.6
 #
 Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
 
@@ -41,10 +41,6 @@ Neutron's API.
 # We provide version like this in order to remove runtime dep on pbr.
 sed -i s/REDHATNEUTRONCLIENTVERSION/%{version}/ neutronclient/version.py
 
-# let RPM handle dependencies
-: > requirements.txt
-: > test-requirements.txt
-
 %build
 %{__python} setup.py build
 
@@ -68,6 +64,9 @@ rm -rf %{buildroot}%{python_sitelib}/neutronclient/tests
 %{_sysconfdir}/profile.d/neutron.sh
 
 %changelog
+* Wed Aug 28 2013 Jakub Ruzicka <jruzicka at redhat.com> - 2.2.6-2
+- Remove all pbr deps in the patch instead of this spec file.
+
 * Tue Aug 27 2013 Jakub Ruzicka <jruzicka at redhat.com> - 2.2.6-1
 - Update to upstream 2.2.6.