From 3184b69c767eef3b8536ab5867598de8cda8e2be Mon Sep 17 00:00:00 2001
From: Haïkel Guémar <hguemar@fedoraproject.org>
Date: Oct 15 2014 19:34:02 +0000
Subject: Update to upstream 2014.2.rc3


---

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 34e58d0..9bde681 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 f2f8259a995a415f77a3d88384926449a91fc590 Mon Sep 17 00:00:00 2001
+From 17ced4482cd1126ae0da6d65b0819dfc7cbcdc91 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady@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 6ebfbeb..f3786e0 100644
--- a/0002-Remove-runtime-dep-on-python-pbr.patch
+++ b/0002-Remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 9c86b7fde22c8d83c228f12823ed5d606041e454 Mon Sep 17 00:00:00 2001
+From 952e1f14c7bf695235db356ea76eb93e5f706289 Mon Sep 17 00:00:00 2001
 From: John Bresnahan <jbresnah@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 95b248b..f0d3426 100644
--- a/0003-avoid-unsupported-storage-drivers.patch
+++ b/0003-avoid-unsupported-storage-drivers.patch
@@ -1,28 +1,12 @@
-From d257f89ea817ce812b6ffc40289c15ebfddeaf48 Mon Sep 17 00:00:00 2001
+From 6787bf30e50ac415639ffd22c04778839950cfc0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
 Date: Wed, 9 Apr 2014 10:31:27 +0100
 Subject: [PATCH] avoid unsupported storage drivers
 
 ---
- etc/glance-api.conf   | 2 --
  etc/glance-cache.conf | 2 --
- 2 files changed, 4 deletions(-)
+ 1 file changed, 2 deletions(-)
 
-diff --git a/etc/glance-api.conf b/etc/glance-api.conf
-index bf5b824..34b2c47 100644
---- a/etc/glance-api.conf
-+++ b/etc/glance-api.conf
-@@ -17,10 +17,8 @@ default_store = file
- #      glance.store.rbd.Store,
- #      glance.store.s3.Store,
- #      glance.store.swift.Store,
--#      glance.store.sheepdog.Store,
- #      glance.store.cinder.Store,
- #      glance.store.gridfs.Store,
--#      glance.store.vmware_datastore.Store,
- #known_stores = glance.store.filesystem.Store,
- #               glance.store.http.Store
- 
 diff --git a/etc/glance-cache.conf b/etc/glance-cache.conf
 index 0246b67..04e5623 100644
 --- a/etc/glance-cache.conf
diff --git a/0004-notify-calling-process-we-are-ready-to-serve.patch b/0004-notify-calling-process-we-are-ready-to-serve.patch
index ef0e6ce..f1b01ad 100644
--- a/0004-notify-calling-process-we-are-ready-to-serve.patch
+++ b/0004-notify-calling-process-we-are-ready-to-serve.patch
@@ -1,4 +1,4 @@
-From 8bca5b3a19bfe038c6bf68f486d2bab7b95c047a Mon Sep 17 00:00:00 2001
+From 490ea11a69c10a5a4396044f3fbc538f0e69f6a2 Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec@redhat.com>
 Date: Tue, 11 Feb 2014 22:36:00 +0100
 Subject: [PATCH] notify calling process we are ready to serve
diff --git a/openstack-glance.spec b/openstack-glance.spec
index cedd52a..d9a7529 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,9 +1,9 @@
 %global release_name juno
-%global milestone rc2
+%global milestone rc3
 
 Name:             openstack-glance
 Version:          2014.2
-Release:          0.11.%{milestone}%{?dist}
+Release:          0.12%{milestone}%{?dist}
 Summary:          OpenStack Image Service
 
 Group:            Applications/System
@@ -22,7 +22,7 @@ Source7:          glance-cache-dist.conf
 Source8:          glance-scrubber-dist.conf
 
 #
-# patches_base=2014.2.rc2
+# patches_base=2014.2.rc3
 #
 Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
 Patch0002: 0002-Remove-runtime-dep-on-python-pbr.patch
@@ -327,6 +327,9 @@ exit 0
 %doc doc/build/html
 
 %changelog
+* Wed Oct 15 2014 Haïkel Guémar <hguemar@fedoraproject.org> 2014.2-0.12.rc3
+- Update to upstream 2014.2.rc3
+
 * Mon Oct 13 2014 Haikel Guemar <hguemar@fedoraproject.org> 2014.2-0.11.rc2
 - Update to upstream 2014.2.rc2