From 8b6067a41aa6d59ed0503e15c5bfa38b22cd7bf2 Mon Sep 17 00:00:00 2001
From: Jakub Ruzicka <jruzicka@redhat.com>
Date: Sep 19 2013 15:43:48 +0000
Subject: Update to upstream 2.15.0


---

diff --git a/.gitignore b/.gitignore
index 0f456a8..2b9b063 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /python-novaclient-2.11.1.tar.gz
 /python-novaclient-2.13.0.tar.gz
 /python-novaclient-2.14.1.tar.gz
+/python-novaclient-2.15.0.tar.gz
diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch
index fa64c76..e29f5b9 100644
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ b/0001-Remove-runtime-dependency-on-python-pbr.patch
@@ -1,7 +1,7 @@
-From 430f741132a631527a8e0e6dff4e866be253d733 Mon Sep 17 00:00:00 2001
+From 7d223685958931ec3d3833cd154314e5bd99de55 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.
+Subject: [PATCH] Remove runtime dependency on python-pbr
 
 ---
  novaclient/__init__.py | 5 +----
diff --git a/0002-Prevent-pbr-dependencies-handling.patch b/0002-Prevent-pbr-dependencies-handling.patch
new file mode 100644
index 0000000..c60e871
--- /dev/null
+++ b/0002-Prevent-pbr-dependencies-handling.patch
@@ -0,0 +1,53 @@
+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 3f7d2d5..f6f8386 100644
--- a/python-novaclient.spec
+++ b/python-novaclient.spec
@@ -1,6 +1,6 @@
 Name:             python-novaclient
 Epoch:            1
-Version:          2.14.1
+Version:          2.15.0
 Release:          1%{?dist}
 Summary:          Python API and CLI for OpenStack Nova
 
@@ -11,9 +11,10 @@ Source0:          http://pypi.python.org/packages/source/p/%{name}/%{name}-%{ver
 
 
 #
-# patches_base=2.14.1
+# patches_base=2.15.0
 #
 Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
+Patch0002: 0002-Prevent-pbr-dependencies-handling.patch
 
 BuildArch:        noarch
 BuildRequires:    python-setuptools
@@ -27,6 +28,7 @@ Requires:         python-prettytable
 Requires:         python-requests
 Requires:         python-simplejson
 Requires:         python-six
+Requires:         python-babel
 Requires:         python-keyring
 Requires:         python-setuptools
 
@@ -52,18 +54,13 @@ 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
 
 # Remove bundled egg-info
 rm -rf python_novaclient.egg-info
-# let RPM handle deps
-# TODO: Have the following handle multi line entries
-sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
-# Remove the requirements files so that pbr hooks don't add them
-# to distutils requiers_dist config.
-rm -rf {test-,}requirements.txt tools/{pip,test}-requires
 
 
 %build
@@ -100,6 +97,11 @@ rm -fr html/.doctrees html/.buildinfo
 %doc html
 
 %changelog
+* Thu Sep 19 2013 Jakub Ruzicka <jruzicka@redhat.com> 
+- Update to upstream 2.15.0
+- Add python-babel dependency
+- Nuke pbr deps handling in patch instead of this spec file
+
 * Wed Aug 07 2013 Jakub Ruzicka <jruzicka@redhat.com> - 1:2.14.1-1
 - Update to upstream version 2.14.1.
 - New build requires: python-d2to1, python-pbr
diff --git a/sources b/sources
index 1a86e07..5312600 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9890462a57c8388f5f38e179a1953fe5  python-novaclient-2.14.1.tar.gz
+b3153d2ddacda126f5d4136ecc6e30a2  python-novaclient-2.15.0.tar.gz