[openstack-glance] Update to upstream 2014.2.1

[Haïkel Guémar]

commit 1ad966cc925654ad45c53bbf79ed440b4fde1acc
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Fri Dec 5 14:51:08 2014 +0100

    Update to upstream 2014.2.1

 .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       |    2 +-
 ...ify-calling-process-we-are-ready-to-serve.patch |    2 +-
 openstack-glance.spec                              |   18 +++++++++---------
 sources                                            |    2 +-
 7 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8bb84fe..5b5ea9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
 /glance-2014.2.rc2.tar.gz
 /glance-2014.2.rc3.tar.gz
 /glance-2014.2.tar.gz
+/glance-2014.2.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 9bde681..cd5bd09 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 17ced4482cd1126ae0da6d65b0819dfc7cbcdc91 Mon Sep 17 00:00:00 2001
+From cd28bae50255652fbe2b7e17dbc71917c38dba97 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 f3786e0..ddc1642 100644
--- a/0002-Remove-runtime-dep-on-python-pbr.patch
+++ b/0002-Remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 952e1f14c7bf695235db356ea76eb93e5f706289 Mon Sep 17 00:00:00 2001
+From cb99e3389282ccd3ab11b0faed363305f4822b83 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 f0d3426..f7bf354 100644
--- a/0003-avoid-unsupported-storage-drivers.patch
+++ b/0003-avoid-unsupported-storage-drivers.patch
@@ -1,4 +1,4 @@
-From 6787bf30e50ac415639ffd22c04778839950cfc0 Mon Sep 17 00:00:00 2001
+From 0ae098262a879f3d15dd36900bc2afb03459e874 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
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 f1b01ad..97df109 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 490ea11a69c10a5a4396044f3fbc538f0e69f6a2 Mon Sep 17 00:00:00 2001
+From 495611818e6de5d5802d8cb3f3630f579c8c18ca Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at 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 d976fb2..c6b91cd 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,7 +1,7 @@
 %global release_name juno
 
 Name:             openstack-glance
-Version:          2014.2
+Version:          2014.2.1
 Release:          1%{?dist}
 Summary:          OpenStack Image Service
 
@@ -10,6 +10,11 @@ License:          ASL 2.0
 URL:              http://glance.openstack.org
 Source0:          https://launchpad.net/glance/%{release_name}/%{version}/+download/glance-%{version}.tar.gz
 
+Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
+Patch0002: 0002-Remove-runtime-dep-on-python-pbr.patch
+Patch0003: 0003-avoid-unsupported-storage-drivers.patch
+Patch0004: 0004-notify-calling-process-we-are-ready-to-serve.patch
+
 Source1:          openstack-glance-api.service
 Source2:          openstack-glance-registry.service
 Source3:          openstack-glance-scrubber.service
@@ -20,14 +25,6 @@ Source6:          glance-registry-dist.conf
 Source7:          glance-cache-dist.conf
 Source8:          glance-scrubber-dist.conf
 
-#
-# patches_base=2014.2
-#
-Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
-Patch0002: 0002-Remove-runtime-dep-on-python-pbr.patch
-Patch0003: 0003-avoid-unsupported-storage-drivers.patch
-Patch0004: 0004-notify-calling-process-we-are-ready-to-serve.patch
-
 BuildArch:        noarch
 BuildRequires:    python2-devel
 BuildRequires:    python-setuptools
@@ -325,6 +322,9 @@ exit 0
 %doc doc/build/html
 
 %changelog
+* Fri Dec 05 2014 Haïkel Guémar <hguemar at fedoraproject.org> 2014.2.1-1
+- Update to upstream 2014.2.1
+
 * Fri Oct 17 2014 Haïkel Guémar <hguemar at fedoraproject.org> 2014.2-1
 - Update to upstream 2014.2
 
diff --git a/sources b/sources
index d8d0703..a1cd9e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c2a2170319d0be52d9a030d5d300c192  glance-2014.2.tar.gz
+7f762bdf8b82bbc1d9a776ecec471ab8  glance-2014.2.1.tar.gz