[python-glanceclient] Update to upstream 0.10.0.
Jakub Ruzicka
jruzicka at fedoraproject.org
Wed Aug 14 18:01:18 UTC 2013
commit 155028f536d495535d1909d3623dd77b842b8056
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date: Wed Aug 14 15:59:00 2013 +0200
Update to upstream 0.10.0.
.gitignore | 1 +
0001-Fix-problem-running-glance-version.patch | 31 ----------
0001-Remove-runtime-dependency-on-python-pbr.patch | 26 +++++++++
...ix-glance-add-parsing-of-copy_from-option.patch | 58 -------------------
...63-image-update-handling-for-closed-stdin.patch | 54 ------------------
python-glanceclient.spec | 59 +++++++++++++++----
sources | 2 +-
7 files changed, 74 insertions(+), 157 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5faa659..7fb0a63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/python-glanceclient-0.8.0.tar.gz
/python-glanceclient-0.9.0.tar.gz
+/python-glanceclient-0.10.0.tar.gz
diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch
new file mode 100644
index 0000000..55c1fd9
--- /dev/null
+++ b/0001-Remove-runtime-dependency-on-python-pbr.patch
@@ -0,0 +1,26 @@
+From 8db13c161b7e1c37df97f14de6382602d5950d03 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 94dd4c9..b662bf9 100644
+--- a/glanceclient/__init__.py
++++ b/glanceclient/__init__.py
+@@ -23,11 +23,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 18d07a5..6b193e8 100644
--- a/python-glanceclient.spec
+++ b/python-glanceclient.spec
@@ -1,7 +1,7 @@
Name: python-glanceclient
Epoch: 1
-Version: 0.9.0
-Release: 3%{?dist}
+Version: 0.10.0
+Release: 1%{?dist}
Summary: Python API and CLI for OpenStack Glance
Group: Development/Languages
@@ -10,17 +10,18 @@ URL: http://github.com/openstack/python-glanceclient
Source0: https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
#
-# patches_base=0.9.0
+# patches_base=0.10.0
#
-Patch0001: 0001-Fix-problem-running-glance-version.patch
-Patch0002: 0002-Fix-glance-add-parsing-of-copy_from-option.patch
-Patch0003: 0003-bug-1166263-image-update-handling-for-closed-stdin.patch
+Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
BuildArch: noarch
+BuildRequires: python2-devel
BuildRequires: python-setuptools
+BuildRequires: python-d2to1
+BuildRequires: python-pbr
Requires: python-httplib2
-Requires: python-keystoneclient >= 1:0.1.2
+Requires: python-keystoneclient
Requires: python-prettytable
Requires: python-setuptools
Requires: python-warlock
@@ -31,17 +32,34 @@ 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
100% of the OpenStack Glance API.
+
+%package doc
+Summary: Documentation for OpenStack Nova API Client
+Group: Documentation
+
+BuildRequires: python-sphinx
+
+%description doc
+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
+100% of the OpenStack Glance API.
+
+This package contains auto-generated documentation.
+
+
%prep
%setup -q
%patch0001 -p1
-%patch0002 -p1
-%patch0003 -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
%build
%{__python} setup.py build
@@ -49,11 +67,14 @@ sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
%install
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-# generate versioninfo
-echo "%{version}" > %{buildroot}%{python_sitelib}/glanceclient/versioninfo
+export PYTHONPATH="$( pwd ):$PYTHONPATH"
+sphinx-build -b html doc/source html
+
+# For some reason, openstack-glance is providing (obsoloete) glance manpage.
+# Enable this once https://bugs.launchpad.net/glance/+bug/1212300 is fixed.
+#sphinx-build -b man doc/source man
+#install -p -D -m 644 man/glance.1 %{buildroot}%{_mandir}/man1/glance.1
-# Delete tests
-rm -fr %{buildroot}%{python_sitelib}/tests
%files
%doc README.rst
@@ -61,8 +82,20 @@ rm -fr %{buildroot}%{python_sitelib}/tests
%{_bindir}/glance
%{python_sitelib}/glanceclient
%{python_sitelib}/*.egg-info
+#%{_mandir}/man1/glance.1.gz
+
+%files doc
+%doc html
+
%changelog
+* Wed Aug 14 2013 Jakub Ruzicka <jruzicka at redhat.com> - 1:0.10.0-1
+- Update to upstream 0.10.0.
+- Remove runtime dependency on python-pbr.
+- Add doc package.
+- New BuildRequires: python2-devel, python-d2to1, python-pbr
+- Remove python-keystoneclient version cap.
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.9.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 1203107..8ce2d07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4cd8a42fe99bb46124354fa362234343 python-glanceclient-0.9.0.tar.gz
+93702227dfb0c839d6d0877d6ad6f95c python-glanceclient-0.10.0.tar.gz
More information about the scm-commits
mailing list