From e7d1a5e91246987590b119bc05a462bbd88cf446 Mon Sep 17 00:00:00 2001
From: John Bresnahan <jbresnah@redhat.com>
Date: Sep 18 2013 22:07:07 +0000
Subject: Sync with patches branch


---

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 198e255..a133f44 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 a73e8b1c6bc9c51356bf966d45d51d8d8162c37e Mon Sep 17 00:00:00 2001
+From 12d3d10d78cc9c5d9852742cee4aa37db73c74bf 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-Use-updated-parallel-install-versions-of-epel-packag.patch b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
index 2990091..de57eb4 100644
--- a/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
+++ b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -1,4 +1,4 @@
-From 22ca4cbf6e12fc210ad7c3ec2e4afdc5f2b4a29d Mon Sep 17 00:00:00 2001
+From 0ff3e09895e120dc2e1b4f3b4f36e0647551ddd0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
 Date: Tue, 23 Jul 2013 12:18:26 +0100
 Subject: [PATCH] Use updated parallel install versions of epel package
diff --git a/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch b/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
index 9ad18c1..3ab76ce 100644
--- a/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
+++ b/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
@@ -1,4 +1,4 @@
-From f11475fdd723c9b08c5efc5d4412f2fa2940df00 Mon Sep 17 00:00:00 2001
+From 29c4a808f68be3d4965a3a4c96481d9e1065569f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
 Date: Tue, 23 Jul 2013 12:19:45 +0100
 Subject: [PATCH] avoid the uneeded dependency on Crypto.Random
diff --git a/0004-Avoid-NULLs-in-crypto-padding.patch b/0004-Avoid-NULLs-in-crypto-padding.patch
index 9226f28..6917561 100644
--- a/0004-Avoid-NULLs-in-crypto-padding.patch
+++ b/0004-Avoid-NULLs-in-crypto-padding.patch
@@ -1,4 +1,4 @@
-From 27dcae6a1f9122c21fb0e71e1ddaed1d1ba1d84f Mon Sep 17 00:00:00 2001
+From 80ae40611ddbda2d4a98bc3b20bfa0424024b329 Mon Sep 17 00:00:00 2001
 From: Eoghan Glynn <eglynn@redhat.com>
 Date: Wed, 30 Jan 2013 17:43:52 +0000
 Subject: [PATCH] Avoid NULLs in crypto padding.
diff --git a/0005-Remove-runtime-dep-on-python-pbr.patch b/0005-Remove-runtime-dep-on-python-pbr.patch
index a932c6e..6c36b50 100644
--- a/0005-Remove-runtime-dep-on-python-pbr.patch
+++ b/0005-Remove-runtime-dep-on-python-pbr.patch
@@ -1,28 +1,28 @@
-From e53ff3df70700ad9e2f7c5fcd3a79626aea70d9b Mon Sep 17 00:00:00 2001
+From 86be8bf127b13bd4f3dc7601d44c0ac41e0cdaa0 Mon Sep 17 00:00:00 2001
 From: John Bresnahan <jbresnah@redhat.com>
-Date: Mon, 9 Sep 2013 16:28:29 -1000
+Date: Wed, 18 Sep 2013 12:04:43 -1000
 Subject: [PATCH] Remove runtime dep on python pbr
 
 ---
- glance/version.py | 28 ++++++++++++++++++++++++++--
- 1 file changed, 26 insertions(+), 2 deletions(-)
+ glance/version.py | 29 +++++++++++++++++++++++++++--
+ 1 file changed, 27 insertions(+), 2 deletions(-)
 
 diff --git a/glance/version.py b/glance/version.py
-index d815183..861e104 100644
+index d815183..9e20ed0 100644
 --- a/glance/version.py
 +++ b/glance/version.py
-@@ -14,7 +14,31 @@
- #    License for the specific language governing permissions and limitations
+@@ -15,6 +15,31 @@
  #    under the License.
  
+ 
+-import pbr.version
 +GLANCE_VENDOR = "OpenStack Foundation"
 +GLANCE_PRODUCT = "OpenStack Glance"
 +GLANCE_PACKAGE = None  # OS distro package version suffix
  
--import pbr.version
-+loaded = False
- 
 -version_info = pbr.version.VersionInfo('glance')
++loaded = False
++
 +
 +class VersionInfo(object):
 +    release = "REDHATGLANCERELEASE"
diff --git a/0006-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch b/0006-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
index a8ecfd4..7f30aa0 100644
--- a/0006-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
+++ b/0006-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
@@ -1,6 +1,6 @@
-From 9d455a5c604a7cac6317d7ffc9f232414eb2542c Mon Sep 17 00:00:00 2001
+From 645c11f79ae15bef1b936aefae53357b33df152d Mon Sep 17 00:00:00 2001
 From: John Bresnahan <jbresnah@redhat.com>
-Date: Mon, 9 Sep 2013 16:33:41 -1000
+Date: Wed, 18 Sep 2013 12:05:45 -1000
 Subject: [PATCH] Revert use oslo.sphinx and remove local copy of doc
 
 ---
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 83ca59f..cf60842 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,6 +1,6 @@
 Name:             openstack-glance
 Version:          2013.2
-Release:          0.7.b3%{?dist}
+Release:          0.8.b3%{?dist}
 Summary:          OpenStack Image Service
 
 Group:            Applications/System