[openstack-ceilometer] update to Havana milestone 3

[Pádraig Brady]

commit 439d7d4e08ab3e23545cb1a17f4e28398961641e
Author: Pádraig Brady <P at draigBrady.com>
Date:   Sat Sep 7 03:03:22 2013 +0100

    update to Havana milestone 3

 .gitignore                                         |    1 +
 ...e-don-t-access-the-net-when-building-docs.patch |   30 ++++++++++++-------
 openstack-ceilometer.spec                          |   13 ++++++--
 sources                                            |    2 +-
 4 files changed, 30 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0bbd404..6f6c258 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /ceilometer-2013.1.g3.tar.gz
 /ceilometer-2013.1.tar.gz
 /ceilometer-2013.2.b1.tar.gz
+/ceilometer-2013.2.b3.tar.gz
diff --git a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
index 3e75770..c6f5653 100644
--- a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -1,4 +1,4 @@
-From 15a43f43bfa62f58706d62b7d1b792bddff0b2d0 Mon Sep 17 00:00:00 2001
+From 405a372272ff73c21bf91aedebfe2afb74b83e9d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Fri, 6 Jan 2012 12:16:34 +0000
 Subject: [PATCH] Ensure we don't access the net when building docs
@@ -7,18 +7,26 @@ Subject: [PATCH] Ensure we don't access the net when building docs
 
 Change-Id: I9d02fb4053a8106672aded1614a2850e21603eb2
 ---
- doc/source/conf.py | 1 -
- 1 file changed, 1 deletion(-)
+ doc/source/conf.py |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 9af5f54..2c8bdf9 100644
+index 9d01807..c89b701 100644
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
-@@ -139,7 +139,6 @@ write_autodoc_index()
- # They can be extensions coming with Sphinx (named 'sphinx.ext.*')
+@@ -141,7 +141,6 @@ write_autodoc_index()
  # or your custom ones.
- extensions = ['sphinx.ext.autodoc',
--              'sphinx.ext.intersphinx',
-               'sphinx.ext.todo',
-               'sphinxcontrib.autohttp.flask',
-               'wsmeext.sphinxext',
+ extensions = [
+     'sphinx.ext.autodoc',
+-    'sphinx.ext.intersphinx',
+     'sphinx.ext.todo',
+     'sphinxcontrib.autohttp.flask',
+     'wsmeext.sphinxext',
+@@ -151,7 +150,6 @@ extensions = [
+     'sphinxcontrib.pecanwsme.rest',
+     'oslo.sphinx',
+ ]
+-
+ wsme_protocols = ['restjson', 'restxml']
+ 
+ todo_include_todos = True
diff --git a/openstack-ceilometer.spec b/openstack-ceilometer.spec
index 78af757..c0c5218 100644
--- a/openstack-ceilometer.spec
+++ b/openstack-ceilometer.spec
@@ -4,13 +4,13 @@
 
 Name:             openstack-ceilometer
 Version:          2013.2
-Release:          0.4.b1%{?dist}
+Release:          0.5.b3%{?dist}
 Summary:          OpenStack measurement collection service
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              https://wiki.openstack.org/wiki/Ceilometer
-Source0:          http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.b1.tar.gz
+Source0:          http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.b3.tar.gz
 Source1:          %{pypi_name}.conf
 Source2:          %{pypi_name}.logrotate
 
@@ -20,7 +20,7 @@ Source12:         %{name}-compute.service
 Source13:         %{name}-central.service
 
 #
-# patches_base=2013.2.b1
+# patches_base=2013.2.b3
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
 
@@ -55,6 +55,8 @@ Requires:         python-lxml
 Requires:         python-anyjson
 Requires:         python-stevedore
 Requires:         python-msgpack
+Requires:         python-netaddr
+Requires:         python-six
 
 Requires:         python-sqlalchemy
 Requires:         python-migrate
@@ -181,7 +183,7 @@ This package contains documentation files for ceilometer.
 %endif
 
 %prep
-%setup -q -n ceilometer-%{version}.b1
+%setup -q -n ceilometer-%{version}.b3
 
 %patch0001 -p1
 
@@ -396,6 +398,9 @@ fi
 
 
 %changelog
+* Mon Sep 9 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.5.b3
+- Update to Havana milestone 3
+
 * Tue Aug 27 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.4.b1
 - Avoid python runtime dependency management
 
diff --git a/sources b/sources
index b15770e..7921c22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1013120aee78b39f3a0bff30ee2559dc  ceilometer-2013.2.b1.tar.gz
+18fce1f0d02753351ef6c68dea8c5926  ceilometer-2013.2.b3.tar.gz