[python-neutronclient/f20] Update to upstream 2.3.4

Jakub Ruzicka jruzicka at fedoraproject.org
Tue Apr 8 16:00:04 UTC 2014


commit e10b4c9a8fedc0031c25e9ea437f7a92fe12d101
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Tue Apr 8 17:59:08 2014 +0200

    Update to upstream 2.3.4

 .gitignore                                         |    1 +
 0001-Remove-runtime-dependency-on-python-pbr.patch |    6 +-
 ...t_auth_info-for-pre-authenticated-clients.patch |   59 --------------------
 python-neutronclient.spec                          |   14 +++--
 sources                                            |    2 +-
 5 files changed, 14 insertions(+), 68 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e3469bc..c218894 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.4.tar.gz
diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch
index fc22ab0..64f3e08 100644
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ b/0001-Remove-runtime-dependency-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 52bf7822894eb3de04450b334e81951e8ed03d7f Mon Sep 17 00:00:00 2001
+From 5f501ec8705bd8dbe48ee1c528f3953cd6fac850 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
@@ -22,12 +22,12 @@ index 9315671..f0b6efc 100644
 -__version__ = pbr.version.VersionInfo('python-neutronclient').version_string()
 +__version__ = "REDHATNEUTRONCLIENTVERSION"
 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/python-neutronclient.spec b/python-neutronclient.spec
index 5673376..08f5c20 100644
--- a/python-neutronclient.spec
+++ b/python-neutronclient.spec
@@ -1,6 +1,6 @@
 Name:       python-neutronclient
-Version:    2.3.1
-Release:    3%{?dist}
+Version:    2.3.4
+Release:    1%{?dist}
 Summary:    Python API and CLI for OpenStack Neutron
 
 Group:      Development/Languages
@@ -9,10 +9,9 @@ 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.4
 #
 Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
-Patch0002: 0002-Fixed-get_auth_info-for-pre-authenticated-clients.patch
 
 BuildArch:  noarch
 
@@ -35,11 +34,13 @@ Neutron's API.
 %setup -q -n %{name}-%{version}
 
 %patch0001 -p1
-%patch0002 -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
+
 %build
 %{__python} setup.py build
 
@@ -62,6 +63,9 @@ rm -rf %{buildroot}%{python_sitelib}/neutronclient/tests
 %{_sysconfdir}/bash_completion.d
 
 %changelog
+* Tue Apr 08 2014 Jakub Ruzicka <jruzicka at redhat.com> 2.3.4-1
+- Update to upstream 2.3.4
+
 * Tue Feb 25 2014 Jakub Ruzicka <jruzicka at redhat.com> 2.3.1-3
 - Fixed get_auth_info() for pre-authenticated clients
 
diff --git a/sources b/sources
index e2c34cc..a4dff08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5417f1695280bd32d0dd8127bc37fb27  python-neutronclient-2.3.1.tar.gz
+90074e5498087d1ab8464294fc68eb80  python-neutronclient-2.3.4.tar.gz


More information about the scm-commits mailing list