From dd5c75163d0d13918262e67d737c3564e05c908d Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar@fedoraproject.org>
Date: Apr 01 2015 15:38:31 +0000
Subject: Update to upstream 2.23.0


---

diff --git a/.gitignore b/.gitignore
index 9354caa..143ead5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /python-novaclient-2.17.0.tar.gz
 /python-novaclient-2.18.1.tar.gz
 /python-novaclient-2.20.0.tar.gz
+/python-novaclient-2.23.0.tar.gz
diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch
deleted file mode 100644
index b0ca303..0000000
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a0fae5ee492f7d29a0950f769fe3dfb35a49d682 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 +----
- setup.py               | 1 -
- 2 files changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/novaclient/__init__.py b/novaclient/__init__.py
-index bfa7553..18e8783 100644
---- a/novaclient/__init__.py
-+++ b/novaclient/__init__.py
-@@ -12,7 +12,4 @@
- #   License for the specific language governing permissions and limitations
- #   under the License.
- 
--import pbr.version
--
--
--__version__ = pbr.version.VersionInfo('python-novaclient').version_string()
-+__version__ = "REDHATNOVACLIENTVERSION"
-diff --git a/setup.py b/setup.py
-index 7363757..09230a0 100644
---- a/setup.py
-+++ b/setup.py
-@@ -26,5 +26,4 @@ except ImportError:
-     pass
- 
- setuptools.setup(
--    setup_requires=['pbr'],
-     pbr=True)
diff --git a/0002-Use-oslo.sphinx-instead-of-oslosphinx.patch b/0002-Use-oslo.sphinx-instead-of-oslosphinx.patch
deleted file mode 100644
index e1c2ac4..0000000
--- a/0002-Use-oslo.sphinx-instead-of-oslosphinx.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 9b6037d02745342eb68b564f61c34bd908957ca3 Mon Sep 17 00:00:00 2001
-From: Jakub Ruzicka <jruzicka@redhat.com>
-Date: Wed, 13 Aug 2014 16:02:22 +0200
-Subject: [PATCH] Use oslo.sphinx instead of oslosphinx
-
----
- doc/source/conf.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index d33aea2..e4d1b8f 100644
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -88,7 +88,7 @@ gen_ref("v3", "Version 3 API Reference",
- # Add any Sphinx extension module names here, as strings. They can be
- # extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'oslosphinx']
-+extensions = ['sphinx.ext.autodoc', 'oslo.sphinx']
- 
- # Add any paths that contain templates here, relative to this directory.
- templates_path = ['_templates']
diff --git a/python-novaclient.spec b/python-novaclient.spec
index 58c16d8..dc92590 100644
--- a/python-novaclient.spec
+++ b/python-novaclient.spec
@@ -1,7 +1,7 @@
 Name:             python-novaclient
 Epoch:            1
-Version:          2.20.0
-Release:          2%{?dist}
+Version:          2.23.0
+Release:          1%{?dist}
 Summary:          Python API and CLI for OpenStack Nova
 
 Group:            Development/Languages
@@ -19,6 +19,8 @@ BuildRequires:    python-netifaces
 
 Requires:         python-argparse
 Requires:         python-iso8601
+Requires:         python-oslo-i18n
+Requires:         python-oslo-serialization
 Requires:         python-oslo-utils
 Requires:         python-prettytable
 Requires:         python-requests
@@ -60,10 +62,10 @@ rm -rf python_novaclient.egg-info
 rm -f {,test-}requirements.txt
 
 %build
-%{__python} setup.py build
+%{__python2} setup.py build
 
 %install
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
 
 mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
 install -pm 644 tools/nova.bash_completion \
@@ -84,8 +86,8 @@ rm -fr html/.doctrees html/.buildinfo
 %doc README.rst
 %doc LICENSE
 %{_bindir}/nova
-%{python_sitelib}/novaclient
-%{python_sitelib}/*.egg-info
+%{python2_sitelib}/novaclient
+%{python2_sitelib}/*.egg-info
 %{_sysconfdir}/bash_completion.d
 %{_mandir}/man1/nova.1.gz
 
@@ -93,6 +95,9 @@ rm -fr html/.doctrees html/.buildinfo
 %doc html
 
 %changelog
+* Wed Apr 01 2015 Haikel Guemar <hguemar@fedoraproject.org> 1:2.23.0-1
+- Update to upstream 2.23.0
+
 * Fri Mar 27 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 1:2.20.0-2
 - Drop unneeded patches
 - New Requires: python-netifaces, python-pbr
diff --git a/sources b/sources
index d7e508e..eb192cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7194c91338f8583acf1b09c51d322a76  python-novaclient-2.20.0.tar.gz
+ad8313700caf4ade23890e5ff75383da  python-novaclient-2.23.0.tar.gz