[openstack-glance] update to Havana GA

[Pádraig Brady]

commit 6ab1e6e41725caeb0ba128af9ab667236b1362f1
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Oct 18 14:08:30 2013 +0100

    update to Havana GA

 .gitignore                                         |    1 +
 ...-Don-t-access-the-net-while-building-docs.patch |    2 +-
 0002-Remove-runtime-dep-on-python-pbr.patch        |    2 +-
 ...-oslo.sphinx-and-remove-local-copy-of-doc.patch |    2 +-
 openstack-glance.spec                              |   14 ++++++++------
 sources                                            |    2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d16421..d888c3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /glance-2013.2.b2.tar.gz
 /glance-2013.2.b3.tar.gz
 /glance-2013.2.rc1.tar.gz
+/glance-2013.2.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 28986ef..e92c559 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 082253c9399e56442a62ef9c0b83936120a1f351 Mon Sep 17 00:00:00 2001
+From e36cefd55672b81557fd61fbe4c91addf41c32fb 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
diff --git a/0002-Remove-runtime-dep-on-python-pbr.patch b/0002-Remove-runtime-dep-on-python-pbr.patch
index 50dbb6b..579898c 100644
--- a/0002-Remove-runtime-dep-on-python-pbr.patch
+++ b/0002-Remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 56c2f9fd2206141364d43b1baf0fd2a3095f5b3a Mon Sep 17 00:00:00 2001
+From 78ddad340b519036b49730db2fb1f39e3b85d73c Mon Sep 17 00:00:00 2001
 From: John Bresnahan <jbresnah at redhat.com>
 Date: Mon, 9 Sep 2013 17:00:28 -1000
 Subject: [PATCH] Remove runtime dep on python pbr
diff --git a/0003-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch b/0003-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
index 7d15934..7664d09 100644
--- a/0003-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
+++ b/0003-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
@@ -1,4 +1,4 @@
-From 17ca15b02030d8b595af64a0ea01d3e9c1f2c137 Mon Sep 17 00:00:00 2001
+From f397849c410c5d3a8ce87fe3cb925b865c277790 Mon Sep 17 00:00:00 2001
 From: John Bresnahan <jbresnah at redhat.com>
 Date: Mon, 9 Sep 2013 17:02:07 -1000
 Subject: [PATCH] Revert use oslo.sphinx and remove local copy of doc
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 53c01dc..c99ea5d 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,12 +1,12 @@
 Name:             openstack-glance
 Version:          2013.2
-Release:          0.12.rc1%{?dist}
+Release:          1%{?dist}
 Summary:          OpenStack Image Service
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              http://glance.openstack.org
-Source0:          https://launchpad.net/glance/havana/havana-3/+download/glance-2013.2.rc1.tar.gz
+Source0:          https://launchpad.net/glance/havana/havana-3/+download/glance-2013.2.tar.gz
 Source1:          openstack-glance-api.service
 Source2:          openstack-glance-registry.service
 Source3:          openstack-glance-scrubber.service
@@ -18,7 +18,7 @@ Source7:          glance-cache-dist.conf
 Source8:          glance-scrubber-dist.conf
 
 #
-# patches_base=2013.2.rc1
+# patches_base=2013.2
 #
 Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
 Patch0002: 0002-Remove-runtime-dep-on-python-pbr.patch
@@ -108,12 +108,11 @@ and delivery services for virtual disk images.
 This package contains documentation files for glance.
 
 %prep
-%setup -q -n glance-%{version}.rc1
-sed -i 's/%{version}.rc1/%{version}/' PKG-INFO
+%setup -q -n glance-%{version}
+
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
-
 # Remove bundled egg-info
 rm -rf glance.egg-info
 sed -i '/\/usr\/bin\/env python/d' glance/common/config.py glance/common/crypt.py glance/db/sqlalchemy/migrate_repo/manage.py
@@ -319,6 +318,9 @@ fi
 %doc doc/build/html
 
 %changelog
+* Fri Oct 18 2013 Pádraig Brady <pbrady at redhat.com> 2013.2-1
+- Update to Havana GA
+
 * Thu Oct 03 2013 Pádraig Brady <pbrady at redhat.com> 2013.2-0.12.rc1
 - Update to 2013.2.rc1
 - Fixup various config file issues
diff --git a/sources b/sources
index 7710ce9..e286096 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e313b5d3d55744b24770e5674ee3e172  glance-2013.2.rc1.tar.gz
+07b2f962d5d1436d32692692bc37f2ed  glance-2013.2.tar.gz