From fe58fbef898851f0296c2bb5cb0d9ced31869f74 Mon Sep 17 00:00:00 2001
From: Jakub Ruzicka <jruzicka@redhat.com>
Date: Feb 27 2014 15:22:19 +0000
Subject: Update to upstream 2.16.0


---

diff --git a/.gitignore b/.gitignore
index 2b9b063..fa7f80a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /python-novaclient-2.13.0.tar.gz
 /python-novaclient-2.14.1.tar.gz
 /python-novaclient-2.15.0.tar.gz
+/python-novaclient-2.16.0.tar.gz
diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch
index e29f5b9..cd20bff 100644
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ b/0001-Remove-runtime-dependency-on-python-pbr.patch
@@ -1,11 +1,12 @@
-From 7d223685958931ec3d3833cd154314e5bd99de55 Mon Sep 17 00:00:00 2001
+From 56e2340aa95609ed229f177e1270adbd10154e18 Mon Sep 17 00:00:00 2001
 From: Jakub Ruzicka <jruzicka@redhat.com>
 Date: Wed, 7 Aug 2013 19:35:08 +0200
 Subject: [PATCH] Remove runtime dependency on python-pbr
 
 ---
  novaclient/__init__.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
+ setup.py               | 1 -
+ 2 files changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/novaclient/__init__.py b/novaclient/__init__.py
 index bfa7553..18e8783 100644
@@ -20,3 +21,13 @@ index bfa7553..18e8783 100644
 -
 -__version__ = pbr.version.VersionInfo('python-novaclient').version_string()
 +__version__ = "REDHATNOVACLIENTVERSION"
+diff --git a/setup.py b/setup.py
+index 70c2b3f..afab729 100644
+--- a/setup.py
++++ b/setup.py
+@@ -18,5 +18,4 @@
+ import setuptools
+ 
+ setuptools.setup(
+-    setup_requires=['pbr'],
+     pbr=True)
diff --git a/0002-Prevent-pbr-dependencies-handling.patch b/0002-Prevent-pbr-dependencies-handling.patch
deleted file mode 100644
index c60e871..0000000
--- a/0002-Prevent-pbr-dependencies-handling.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2d21fca7ef3f79ca11eadc9726832e89fcc3ec02 Mon Sep 17 00:00:00 2001
-From: Jakub Ruzicka <jruzicka@redhat.com>
-Date: Thu, 19 Sep 2013 15:26:36 +0200
-Subject: [PATCH] Prevent pbr dependencies handling
-
----
- requirements.txt      |  8 --------
- setup.py              |  1 -
- test-requirements.txt | 10 ----------
- 3 files changed, 19 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 c4eb2a0..0000000
---- a/requirements.txt
-+++ /dev/null
-@@ -1,8 +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
--Babel>=0.9.6
-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 07409e8..0000000
---- a/test-requirements.txt
-+++ /dev/null
-@@ -1,10 +0,0 @@
--hacking>=0.5.6,<0.8
--
--coverage>=3.6
--discover
--fixtures>=0.3.12
--keyring>=1.6.1
--mock>=0.8.0
--sphinx>=1.1.2
--testrepository>=0.0.17
--testtools>=0.9.32
diff --git a/python-novaclient.spec b/python-novaclient.spec
index f6f8386..377f034 100644
--- a/python-novaclient.spec
+++ b/python-novaclient.spec
@@ -1,7 +1,7 @@
 Name:             python-novaclient
 Epoch:            1
-Version:          2.15.0
-Release:          1%{?dist}
+Version:          2.16.0
+Release:          2%{?dist}
 Summary:          Python API and CLI for OpenStack Nova
 
 Group:            Development/Languages
@@ -11,10 +11,9 @@ Source0:          http://pypi.python.org/packages/source/p/%{name}/%{name}-%{ver
 
 
 #
-# patches_base=2.15.0
+# patches_base=2.16.0
 #
 Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
-Patch0002: 0002-Prevent-pbr-dependencies-handling.patch
 
 BuildArch:        noarch
 BuildRequires:    python-setuptools
@@ -54,7 +53,6 @@ This package contains auto-generated documentation.
 %setup -q
 
 %patch0001 -p1
-%patch0002 -p1
 
 # We provide version like this in order to remove runtime dep on pbr.
 sed -i s/REDHATNOVACLIENTVERSION/%{version}/ novaclient/__init__.py
@@ -62,6 +60,8 @@ sed -i s/REDHATNOVACLIENTVERSION/%{version}/ novaclient/__init__.py
 # Remove bundled egg-info
 rm -rf python_novaclient.egg-info
 
+# Let RPM handle the requirements
+rm -f {,test-}requirements.txt
 
 %build
 %{__python} setup.py build
@@ -97,6 +97,9 @@ rm -fr html/.doctrees html/.buildinfo
 %doc html
 
 %changelog
+* Wed Feb 26 2014 Jakub Ruzicka <jruzicka@redhat.com> 2.16.0-2
+- Update to upstream 2.16.0
+
 * Thu Sep 19 2013 Jakub Ruzicka <jruzicka@redhat.com> 
 - Update to upstream 2.15.0
 - Add python-babel dependency
diff --git a/sources b/sources
index 5312600..ae02733 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b3153d2ddacda126f5d4136ecc6e30a2  python-novaclient-2.15.0.tar.gz
+d81ce6367a43234de96f113851f9ef97  python-novaclient-2.16.0.tar.gz