[python-glanceclient/el6-havana: 3/3] Merge branch 'master' into el6-havana

[Jakub Ruzicka]

commit 170b023dbc3a294bbbca92023d97af6ab147a042
Merge: 16db7f5 155028f
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Wed Aug 14 20:09:47 2013 +0200

    Merge branch 'master' into el6-havana
    
    Conflicts:
    	python-glanceclient.spec

 .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                           |   61 +++++++++++++++-----
 sources                                            |    2 +-
 7 files changed, 74 insertions(+), 159 deletions(-)
---
diff --cc python-glanceclient.spec
index 4547fe2,6b193e8..0338e1c
--- a/python-glanceclient.spec
+++ b/python-glanceclient.spec
@@@ -32,6 -32,21 +32,21 @@@ This is a client for the OpenStack Glan
  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
++BuildRequires:    python-sphinx10
+ 
+ %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
  
@@@ -51,11 -67,14 +67,14 @@@ rm -rf {,test-}requirements.tx
  %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
++sphinx-1.0-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
++#sphinx-1.0-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
@@@ -63,10 -82,22 +82,22 @@@
  %{_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
 +* Tue Aug 13 2013 Jakub Ruzicka <jruzicka at redhat.com> - 1:0.9.0-3
 +- Fix SSL certificate CNAME checking. (CVE-2013-4111)
  
  * Mon May 06 2013 Jakub Ruzicka <jruzicka at redhat.com> - 1:0.9.0-2
  - versioninfo is gone from tarball, generate it.