hguemar pushed to python-neutronclient (master). "Update to upstream 2.3.11"

[notifications at fedoraproject.org]

>From 90beff662bc10989021f3311c3736f0c6015a2eb Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar at fedoraproject.org>
Date: Fri, 27 Mar 2015 15:07:14 +0100
Subject: Update to upstream 2.3.11


diff --git a/.gitignore b/.gitignore
index 1e493f2..33beeff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /python-neutronclient-2.3.4.tar.gz
 /python-neutronclient-2.3.6.tar.gz
 /python-neutronclient-2.3.9.tar.gz
+/python-neutronclient-2.3.11.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 9846cf4..0000000
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From df9467819ab13133e1d2dad527b8980ea665f22d 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 +----
- setup.py                 | 1 -
- 2 files changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/neutronclient/version.py b/neutronclient/version.py
-index 9315671..f0b6efc 100644
---- a/neutronclient/version.py
-+++ b/neutronclient/version.py
-@@ -16,7 +16,4 @@
- # vim: tabstop=4 shiftwidth=4 softtabstop=4
- # @author: Carl Baldwin, Hewlett-Packard
- 
--import pbr.version
--
--
--__version__ = pbr.version.VersionInfo('python-neutronclient').version_string()
-+__version__ = "REDHATNEUTRONCLIENTVERSION"
-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/python-neutronclient.spec b/python-neutronclient.spec
index 8b0931f..8a57c35 100644
--- a/python-neutronclient.spec
+++ b/python-neutronclient.spec
@@ -1,5 +1,5 @@
 Name:       python-neutronclient
-Version:    2.3.9
+Version:    2.3.11
 Release:    1%{?dist}
 Summary:    Python API and CLI for OpenStack Neutron
 
@@ -8,8 +8,6 @@ License:    ASL 2.0
 URL:        http://launchpad.net/python-neutronclient/
 Source0:    https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 
-Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
-
 BuildArch:  noarch
 
 BuildRequires: python2-devel
@@ -20,11 +18,16 @@ BuildRequires: python-d2to1
 Requires: pyparsing
 Requires: python-cliff >= 1.0
 Requires: python-keystoneclient >= 0.9.0
+Requires: python-oslo-i18n
+Requires: python-oslo-serialization
+Requires: python-oslo-utils
+Requires: python-pbr
 Requires: python-prettytable >= 0.6
 Requires: python-requests
 Requires: python-setuptools
 Requires: python-simplejson
 
+
 %description
 Client library and command line utility for interacting with Openstack
 Neutron's API.
@@ -32,11 +35,6 @@ Neutron's API.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch0001 -p1
-
-# 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
 
@@ -62,6 +60,11 @@ rm -rf %{buildroot}%{python_sitelib}/neutronclient/tests
 %{_sysconfdir}/bash_completion.d
 
 %changelog
+* Fri Mar 27 2015 Haikel Guemar <hguemar at fedoraproject.org> 2.3.11-1
+- Update to upstream 2.3.11
+- Add Requires: python-pbr (drop the patch)
+- Add Requires: python-oslo-i18n, python-oslo-serialization, python-oslo-utils
+
 * Mon Oct 13 2014 Jakub Ruzicka <jruzicka at redhat.com> 2.3.9-1
 - Update to upstream 2.3.9
 
diff --git a/sources b/sources
index bdb7a88..9ad45f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38e49fa744c482883ecd27863b2b2287  python-neutronclient-2.3.9.tar.gz
+211c39b6e3557f83279b755555681ced  python-neutronclient-2.3.11.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-neutronclient.git/commit/?h=master&id=90beff662bc10989021f3311c3736f0c6015a2eb