[openstack-glance] update to Icehouse release

[Pádraig Brady]

commit 23d5d3a68ef3dc886c04349cc28751e2d68331ea
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Apr 17 15:09:47 2014 +0100

    update to Icehouse release

 .gitignore                                         |    1 +
 ...-Don-t-access-the-net-while-building-docs.patch |    2 +-
 0002-Remove-runtime-dep-on-python-pbr.patch        |    2 +-
 0003-avoid-unsupported-storage-drivers.patch       |    4 ++--
 openstack-glance.spec                              |   12 ++++++++----
 sources                                            |    2 +-
 6 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e10a0d..8fd212c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /glance-2014.1.b3.tar.gz
 /glance-2014.1.rc1.tar.gz
 /glance-2014.1.rc2.tar.gz
+/glance-2014.1.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 6a8d901..012858e 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 36525d5b3b3b48c0fc51967d24ba63077358fc6c Mon Sep 17 00:00:00 2001
+From 721c886380656d924362baaba0849f5faba0e760 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 e36eb07..2689aff 100644
--- a/0002-Remove-runtime-dep-on-python-pbr.patch
+++ b/0002-Remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 45bef41c1a537426877cef1a1700886598035b04 Mon Sep 17 00:00:00 2001
+From 2c76865865fac5ab24579802005d995fa97d138a 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-avoid-unsupported-storage-drivers.patch b/0003-avoid-unsupported-storage-drivers.patch
index 8dca99a..6d785ec 100644
--- a/0003-avoid-unsupported-storage-drivers.patch
+++ b/0003-avoid-unsupported-storage-drivers.patch
@@ -1,4 +1,4 @@
-From 976f4410ac3cac420c2f396a21e2ad6ddfa21373 Mon Sep 17 00:00:00 2001
+From a19f8c524e25435caaab56b1bbade7fe22dad395 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
 Date: Wed, 9 Apr 2014 10:31:27 +0100
 Subject: [PATCH] avoid unsupported storage drivers
@@ -10,7 +10,7 @@ Subject: [PATCH] avoid unsupported storage drivers
  3 files changed, 0 insertions(+), 6 deletions(-)
 
 diff --git a/etc/glance-api.conf b/etc/glance-api.conf
-index 12eca91..218e47d 100644
+index 8b4bf66..c53be76 100644
 --- a/etc/glance-api.conf
 +++ b/etc/glance-api.conf
 @@ -17,10 +17,8 @@ default_store = file
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 4e51a4b..0aa5351 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,12 +1,12 @@
 Name:             openstack-glance
 Version:          2014.1
-Release:          0.6.rc2%{?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/icehouse/icehouse-2/+download/glance-%{version}.rc2.tar.gz
+Source0:          https://launchpad.net/glance/icehouse/%{version}/+download/glance-%{version}.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=2014.1.rc2
+# patches_base=2014.1
 #
 Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
 Patch0002: 0002-Remove-runtime-dep-on-python-pbr.patch
@@ -108,11 +108,12 @@ and delivery services for virtual disk images.
 This package contains documentation files for glance.
 
 %prep
-%setup -q -n glance-%{version}.rc2
+%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
@@ -292,6 +293,9 @@ fi
 %doc doc/build/html
 
 %changelog
+* Thu Apr 17 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-1
+- Update to Icehouse release
+
 * Sat Apr 12 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.6.rc2
 - Update to Icehouse release candidate 2
 
diff --git a/sources b/sources
index eb55e06..18c2038 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7eaaeb35fcb7ba284b1d3dc05ea31b51  glance-2014.1.rc2.tar.gz
+f6514c0b508c5cb93c5024e1676ea56a  glance-2014.1.tar.gz