From 23d5d3a68ef3dc886c04349cc28751e2d68331ea Mon Sep 17 00:00:00 2001 From: Pádraig Brady
Date: Apr 17 2014 14:22:20 +0000
Subject: update to Icehouse release
---
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?=
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