[python-neutronclient] Update to upstream 2.3.3

[Jakub Ruzicka]

commit 862077040afd65f5214eddb41cf5613e9c97eb09
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Mon Jan 13 19:26:01 2014 +0100

    Update to upstream 2.3.3

 .gitignore                                         |    1 +
 0001-Remove-runtime-dependency-on-python-pbr.patch |   47 +++-----------------
 python-neutronclient.spec                          |   12 ++++-
 sources                                            |    2 +-
 4 files changed, 17 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e3469bc..54db897 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /python-neutronclient-2.2.6.tar.gz
 /python-neutronclient-2.3.0.tar.gz
 /python-neutronclient-2.3.1.tar.gz
+/python-neutronclient-2.3.3.tar.gz
diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch
index 2e5e598..51c1048 100644
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ b/0001-Remove-runtime-dependency-on-python-pbr.patch
@@ -1,16 +1,12 @@
-From 29386e4f4042b22d0ce2cadd0c2b381b42f52c46 Mon Sep 17 00:00:00 2001
+From 23f1d700a37eced5fb33cc75b7b64ae5a3b0f0c9 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 +----
- requirements.txt         |  8 --------
- setup.py                 |  1 -
- test-requirements.txt    | 11 -----------
- 4 files changed, 1 insertion(+), 24 deletions(-)
- delete mode 100644 requirements.txt
- delete mode 100644 test-requirements.txt
+ neutronclient/version.py | 5 +----
+ setup.py                 | 1 -
+ 2 files changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/neutronclient/version.py b/neutronclient/version.py
 index 9315671..f0b6efc 100644
@@ -25,44 +21,13 @@ 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 22e6b09..0000000
---- a/requirements.txt
-+++ /dev/null
-@@ -1,8 +0,0 @@
--pbr>=0.5.21,<1.0
--argparse
--cliff>=1.4.3
--httplib2
--iso8601>=0.1.4
--simplejson>=2.0.9
--six
--Babel>=0.9.6
 diff --git a/setup.py b/setup.py
-index 2a0786a..afab729 100644
+index 70c2b3f..afab729 100644
 --- 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 a684fdd..0000000
---- a/test-requirements.txt
-+++ /dev/null
-@@ -1,11 +0,0 @@
--hacking>=0.5.6,<0.8
--
--cliff-tablib>=1.0
--coverage>=3.6
--discover
--fixtures>=0.3.14
--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 293ff65..b1786db 100644
--- a/python-neutronclient.spec
+++ b/python-neutronclient.spec
@@ -1,6 +1,6 @@
 Name:       python-neutronclient
-Version:    2.3.1
-Release:    2%{?dist}
+Version:    2.3.3
+Release:    1%{?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.3.1
+# patches_base=2.3.3
 #
 Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
 
@@ -38,6 +38,9 @@ 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 the dependencies
+rm -f test-requirements.txt requirements.txt
+
 %build
 %{__python} setup.py build
 
@@ -60,6 +63,9 @@ rm -rf %{buildroot}%{python_sitelib}/neutronclient/tests
 %{_sysconfdir}/bash_completion.d
 
 %changelog
+* Mon Jan 13 2014 Jakub Ruzicka <jruzicka at redhat.com> 2.3.3-1
+- Update to upstream 2.3.3
+
 * Fri Nov 01 2013 Jakub Ruzicka <jruzicka at redhat.com> - 2.3.1-2
 - Don't obsolete python-quantumclient (#1025509)
 
diff --git a/sources b/sources
index e2c34cc..dc3b977 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5417f1695280bd32d0dd8127bc37fb27  python-neutronclient-2.3.1.tar.gz
+33acfcb8634d1dd68406ec5a8699a4e5  python-neutronclient-2.3.3.tar.gz