[openstack-glance/el6-icehouse] update to Icehouse release

[Pádraig Brady]

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

    update to Icehouse release
    
    Conflicts:
    
    	openstack-glance.spec

 .gitignore                                   |    1 +
 0006-avoid-unsupported-storage-drivers.patch |    2 +-
 openstack-glance.spec                        |   11 +++++++----
 sources                                      |    2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a8e71b9..1f731ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,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/0006-avoid-unsupported-storage-drivers.patch b/0006-avoid-unsupported-storage-drivers.patch
index 75ab80e..cd1a802 100644
--- a/0006-avoid-unsupported-storage-drivers.patch
+++ b/0006-avoid-unsupported-storage-drivers.patch
@@ -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 5d8d1bf..6033982 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -2,13 +2,13 @@
 
 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/%{release_name}/%{release_name}-3/+download/glance-%{version}.rc2.tar.gz
+Source0:          https://launchpad.net/glance/icehouse/%{version}/+download/glance-%{version}.tar.gz
 Source1:          openstack-glance-api.init
 Source100:        openstack-glance-api.upstart
 Source2:          openstack-glance-registry.init
@@ -23,7 +23,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-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -117,7 +117,7 @@ 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
@@ -311,6 +311,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