[python-ceilometerclient/el6-havana] Update to upstream 1.0.8

[Jakub Ruzicka]

commit 7b2a11fb393196bec7040595ced0782c4e9c07a9
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Mon Dec 16 20:03:31 2013 +0100

    Update to upstream 1.0.8
    
    Changelog:
    - Update to upstream 1.0.8
    - New dependency: python-six
    - Use python-sphinx10 package

 .gitignore                                         |    1 +
 0001-Remove-runtime-dependency-on-python-pbr.patch |   22 ++++++++++----------
 python-ceilometerclient.spec                       |   16 +++++++++-----
 sources                                            |    2 +-
 4 files changed, 23 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c58f198..a4f9701 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /python-ceilometerclient-1.0.1.tar.gz
 /python-ceilometerclient-1.0.3.tar.gz
 /python-ceilometerclient-1.0.6.tar.gz
+/python-ceilometerclient-1.0.8.tar.gz
diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch
index c751787..9ef169b 100644
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ b/0001-Remove-runtime-dependency-on-python-pbr.patch
@@ -1,13 +1,13 @@
-From 20e1c62796eb59d3f390632e4ad99e4168951977 Mon Sep 17 00:00:00 2001
+From 9d9ce57d9e7c9d83fa0042d643e5fd112203b424 Mon Sep 17 00:00:00 2001
 From: Jakub Ruzicka <jruzicka at redhat.com>
 Date: Tue, 16 Jul 2013 18:09:30 +0200
 Subject: [PATCH] Remove runtime dependency on python-pbr
 
 ---
  ceilometerclient/__init__.py |  8 +-------
- requirements.txt             |  6 ------
+ requirements.txt             |  7 -------
  setup.py                     |  1 -
- test-requirements.txt        | 14 --------------
+ test-requirements.txt        | 13 -------------
  4 files changed, 1 insertion(+), 28 deletions(-)
  delete mode 100644 requirements.txt
  delete mode 100644 test-requirements.txt
@@ -30,16 +30,17 @@ index d6efb69..b73e453 100644
 +__version__ = "REDHATCEILOMETERCLIENTVERSION"
 diff --git a/requirements.txt b/requirements.txt
 deleted file mode 100644
-index 7e5ea47..0000000
+index 64d96fe..0000000
 --- a/requirements.txt
 +++ /dev/null
-@@ -1,6 +0,0 @@
+@@ -1,7 +0,0 @@
 -pbr>=0.5.21,<1.0
 -argparse
 -httplib2
--iso8601>=0.1.4
+-iso8601>=0.1.8
 -PrettyTable>=0.6,<0.8
--python-keystoneclient>=0.3.2
+-python-keystoneclient>=0.4.1
+-six>=1.4.1
 diff --git a/setup.py b/setup.py
 index 70c2b3f..afab729 100644
 --- a/setup.py
@@ -52,20 +53,19 @@ index 70c2b3f..afab729 100644
      pbr=True)
 diff --git a/test-requirements.txt b/test-requirements.txt
 deleted file mode 100644
-index 26843ce..0000000
+index 20f1e8e..0000000
 --- a/test-requirements.txt
 +++ /dev/null
-@@ -1,14 +0,0 @@
+@@ -1,13 +0,0 @@
 -# Install bounded pep8/pyflakes first, then let flake8 install
 -pep8==1.4.5
 -pyflakes>=0.7.2,<0.7.4
 -flake8==2.0
--hacking>=0.5.6,<0.8
+-hacking>=0.8.0,<0.9
 -coverage>=3.6
 -discover
 -fixtures>=0.3.14
 -mock>=1.0
--mox>=0.5.3
 -python-subunit
 -sphinx>=1.1.2
 -testrepository>=0.0.17
diff --git a/python-ceilometerclient.spec b/python-ceilometerclient.spec
index 63c4102..9b3d4ac 100644
--- a/python-ceilometerclient.spec
+++ b/python-ceilometerclient.spec
@@ -1,5 +1,5 @@
 Name:             python-ceilometerclient
-Version:          1.0.6
+Version:          1.0.8
 Release:          1%{?dist}
 Summary:          Python API and CLI for OpenStack Ceilometer
 
@@ -19,9 +19,10 @@ Requires:         python-argparse
 Requires:         python-prettytable
 Requires:         python-iso8601
 Requires:         python-keystoneclient
+Requires:         python-six
 
 #
-# patches_base=1.0.6
+# patches_base=1.0.8
 #
 Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
 
@@ -35,7 +36,7 @@ provides a Python API (the ceilometerclient module) and a command-line tool
 Summary:          Documentation for OpenStack Ceilometer API Client
 Group:            Documentation
 
-BuildRequires:    python-sphinx
+BuildRequires:    python-sphinx10
 
 %description      doc
 This is a client library for Ceilometer built on the Ceilometer API. It
@@ -52,8 +53,6 @@ This package contains auto-generated documentation.
 
 sed -i s/REDHATCEILOMETERCLIENTVERSION/%{version}/ ceilometerclient/__init__.py
 
-# "nature" theme is not available in epel sphinx distribution
-sed -i "s/^\(html_theme = 'nature'\)$/#\1/" doc/source/conf.py
 
 %build
 %{__python} setup.py build
@@ -62,7 +61,7 @@ sed -i "s/^\(html_theme = 'nature'\)$/#\1/" doc/source/conf.py
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
-sphinx-build -b html doc/source html
+sphinx-1.0-build -b html doc/source html
 
 # Fix hidden-file-or-dir warnings
 rm -rf html/.doctrees html/.buildinfo
@@ -78,6 +77,11 @@ rm -rf html/.doctrees html/.buildinfo
 %doc html
 
 %changelog
+* Mon Dec 16 2013 Jakub Ruzicka <jruzicka at redhat.com> 1.0.8-1
+- Update to upstream 1.0.8
+- New dependency: python-six
+- Use python-sphinx10 package
+
 * Mon Oct 07 2013 Jakub Ruzicka <jruzicka at redhat.com> 1.0.6-1
 - Update to upstream 1.0.6.
 
diff --git a/sources b/sources
index 6b75dec..a5f1832 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc3d8ff3ef1eaf12197de583042fe953  python-ceilometerclient-1.0.6.tar.gz
+028c21693ce250ceef99e9cebcc9d476  python-ceilometerclient-1.0.8.tar.gz