hguemar pushed to python-glanceclient (master). "Update to upstream 0.17.0"

[notifications at fedoraproject.org]

>From c62050a8ede4e777abeefe2506bbac14bdebcbc3 Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar at fedoraproject.org>
Date: Fri, 27 Mar 2015 10:11:16 +0100
Subject: Update to upstream 0.17.0


diff --git a/.gitignore b/.gitignore
index 8c58f7d..3897d8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /python-glanceclient-0.14.1.tar.gz
 /python-glanceclient-0.14.2.tar.gz
 /python-glanceclient-0.15.0.tar.gz
+/python-glanceclient-0.17.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 c7d1f6f..0000000
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 23af7f2f1be2c5f2c228f0ddd4e88ee998206711 Mon Sep 17 00:00:00 2001
-From: Jakub Ruzicka <jruzicka at redhat.com>
-Date: Wed, 14 Aug 2013 16:07:03 +0200
-Subject: [PATCH] Remove runtime dependency on python-pbr.
-
----
- glanceclient/__init__.py | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/glanceclient/__init__.py b/glanceclient/__init__.py
-index f967031..ca5ac5f 100644
---- a/glanceclient/__init__.py
-+++ b/glanceclient/__init__.py
-@@ -21,11 +21,4 @@ except ImportError:
-     import warnings
-     warnings.warn("Could not import glanceclient.client", ImportWarning)
- 
--import pbr.version
--
--version_info = pbr.version.VersionInfo('python-glanceclient')
--
--try:
--    __version__ = version_info.version_string()
--except AttributeError:
--    __version__ = None
-+__version__ = "REDHATGLANCECLIENTVERSION"
diff --git a/python-glanceclient.spec b/python-glanceclient.spec
index 35f5ed8..e437290 100644
--- a/python-glanceclient.spec
+++ b/python-glanceclient.spec
@@ -1,32 +1,31 @@
 Name:             python-glanceclient
 Epoch:            1
-Version:          0.15.0
+Version:          0.17.0
 Release:          1%{?dist}
 Summary:          Python API and CLI for OpenStack Glance
 
-Group:            Development/Languages
 License:          ASL 2.0
 URL:              http://github.com/openstack/python-glanceclient
 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
 BuildRequires:    python-setuptools
 BuildRequires:    python-d2to1
 BuildRequires:    python-pbr
-BuildRequires:    python-oslo-sphinx
 
 Requires:         python-httplib2
 Requires:         python-keystoneclient
 Requires:         python-oslo-utils
+Requires:         python-netiface
+Requires:         python-pbr
 Requires:         python-prettytable
 Requires:         python-requests >= 2.2.0
 Requires:         python-setuptools
 Requires:         python-warlock
 Requires:         pyOpenSSL
 
+
 %description
 This is a client for the OpenStack Glance API. There's a Python API (the
 glanceclient module), and a command-line script (glance). Each implements
@@ -35,9 +34,9 @@ glanceclient module), and a command-line script (glance). Each implements
 
 %package doc
 Summary:          Documentation for OpenStack Nova API Client
-Group:            Documentation
 
 BuildRequires:    python-sphinx
+BuildRequires:    python-oslo-sphinx
 
 %description      doc
 This is a client for the OpenStack Glance API. There's a Python API (the
@@ -50,24 +49,19 @@ This package contains auto-generated documentation.
 %prep
 %setup -q
 
-%patch0001 -p1
-
-# We provide version like this in order to remove runtime dep on pbr.
-sed -i s/REDHATGLANCECLIENTVERSION/%{version}/ glanceclient/__init__.py
-
 # Remove bundled egg-info
 rm -rf python_glanceclient.egg-info
 # let RPM handle deps
 sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
 rm -rf {,test-}requirements.txt
 
-sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
 
 %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}
 
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
 sphinx-build -b html doc/source html
@@ -81,8 +75,8 @@ install -p -D -m 644 man/glance.1 %{buildroot}%{_mandir}/man1/glance.1
 %doc README.rst
 %doc LICENSE
 %{_bindir}/glance
-%{python_sitelib}/glanceclient
-%{python_sitelib}/*.egg-info
+%{python2_sitelib}/glanceclient
+%{python2_sitelib}/*.egg-info
 %{_mandir}/man1/glance.1.gz
 
 %files doc
@@ -90,6 +84,11 @@ install -p -D -m 644 man/glance.1 %{buildroot}%{_mandir}/man1/glance.1
 
 
 %changelog
+* Fri Mar 27 2015 Haikel Guemar <hguemar at fedoraproject.org> 1:0.17.0-1
+- Update to upstream 0.17.0
+- Use versioned python macro
+- Drop unneeded patches (Requires: python-pbr)
+
 * Tue Jan 13 2015 Jakub Ruzicka <jruzicka at redhat.com> 1:0.15.0-1
 - Update to upstream 0.15.0
 
diff --git a/sources b/sources
index 4230e6e..4fb1f78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03ded357c4bd0575cf2749938bb64a51  python-glanceclient-0.15.0.tar.gz
+b7e7d958f2c7651910b3c657c3ac3d3f  python-glanceclient-0.17.0.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-glanceclient.git/commit/?h=master&id=c62050a8ede4e777abeefe2506bbac14bdebcbc3