[openstack-glance] update to Havana milestone 2

[Pádraig Brady]

commit e5a7372aace9179d246392ca6c68ddfb5c23ccad
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue Jul 23 11:59:50 2013 +0100

    update to Havana milestone 2

 .gitignore                                         |    1 +
 ...-Don-t-access-the-net-while-building-docs.patch |    6 +++---
 openstack-glance.spec                              |   20 +++++++++++---------
 sources                                            |    2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ebc8ea1..f273ffb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /glance-2013.1.tar.gz
 /glance-2013.1.2.tar.gz
 /glance-2013.2.b1.tar.gz
+/glance-2013.2.b2.tar.gz
diff --git a/0001-Don-t-access-the-net-while-building-docs.patch b/0001-Don-t-access-the-net-while-building-docs.patch
index aab5154..21564a2 100644
--- a/0001-Don-t-access-the-net-while-building-docs.patch
+++ b/0001-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From ae2a6cfe176dbfc019ab0f6ebb663d0c385c8c6c Mon Sep 17 00:00:00 2001
+From 25ea091172a0d36fb331e3d7a6547f4d49ded61c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Fri, 6 Jan 2012 17:12:54 +0000
 Subject: [PATCH] Don't access the net while building docs
@@ -8,8 +8,8 @@ Subject: [PATCH] Don't access the net while building docs
 Change-Id: I42c6e3a5062db209a0abe00cebc04d383c79cbcb
 (cherry picked from commit f2b4bb4e45afcc178200966193a7b87401c534d7)
 ---
- doc/source/conf.py | 1 -
- 1 file changed, 1 deletion(-)
+ doc/source/conf.py |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
 index f926b61..68b9973 100644
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 7adf5df..3736714 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,21 +1,19 @@
-%global milestone 1
-
 Name:             openstack-glance
 Version:          2013.2
-Release:          0.3.b1%{?dist}
+Release:          0.4.b2%{?dist}
 Summary:          OpenStack Image Service
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              http://glance.openstack.org
-Source0:          https://launchpad.net/glance/havana/havana-1/+download/glance-2013.2.b1.tar.gz
+Source0:          https://launchpad.net/glance/havana/havana-2/+download/glance-2013.2.b2.tar.gz
 Source1:          openstack-glance-api.service
 Source2:          openstack-glance-registry.service
 Source3:          openstack-glance-scrubber.service
 Source4:          openstack-glance.logrotate
 
 #
-# patches_base=2013.2.b1
+# patches_base=2013.2.b2
 #
 Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
 
@@ -62,6 +60,7 @@ Requires:         python-webob
 Requires:         python-crypto
 Requires:         pyxattr
 Requires:         python-swiftclient
+Requires:         python-cinderclient
 Requires:         python-oslo-config
 
 #test deps: python-mox python-nose python-requests
@@ -99,8 +98,8 @@ and delivery services for virtual disk images.
 This package contains documentation files for glance.
 
 %prep
-%setup -q -n glance-%{version}.b%{milestone}
-sed -i 's/%{version}.b%{milestone}/%{version}/' PKG-INFO
+%setup -q -n glance-%{version}.b2
+sed -i 's/%{version}.b2/%{version}/' PKG-INFO
 %patch0001 -p1
 
 # Remove bundled egg-info
@@ -275,10 +274,13 @@ fi
 %doc doc/build/html
 
 %changelog
-* Fri Jun  7 2013 John Bresnahan <jbresnah at redhat.com> 2013.2-0.3b1
+* Tue Jul 23 2013 Pádraig Brady <pbrady at redhat.com> 2013.2-0.4.b2
+- Update to Havana milestone 2
+
+* Fri Jun  7 2013 John Bresnahan <jbresnah at redhat.com> 2013.2-0.3.b1
 - Don't access the net while building docs
 
-* Thu Jun  6 2013 John Bresnahan <jbresnah at redhat.com> 2013.2-0.1b1
+* Thu Jun  6 2013 John Bresnahan <jbresnah at redhat.com> 2013.2-0.1.b1
 - Update to version 2013.2.b1
 
 * Thu Jun  6 2013 John Bresnahan <jbresnah at redhat.com> 2013.1.2
diff --git a/sources b/sources
index e11aaa2..f21ac08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28b8f0fcfda939a0485da220f0f331ed  glance-2013.2.b1.tar.gz
+b9a7986cdfd0eea4777b10eb7044bba7  glance-2013.2.b2.tar.gz