[openstack-glance/el6-havana] Updated stable havana release 2013.2.2

[Flavio Percoco]

commit 5c9f1e17479a2d2bc1c130cfc92cf7b41ea543ff
Author: Flavio Percoco <flaper87 at gmail.com>
Date:   Fri Feb 14 13:50:06 2014 +0100

    Updated stable havana release 2013.2.2

 ...-Don-t-access-the-net-while-building-docs.patch |   25 ---------
 ... => 0001-Remove-runtime-dep-on-python-pbr.patch |    6 +-
 ...-oslo.sphinx-and-remove-local-copy-of-doc.patch |   14 +++---
 ...-parallel-install-versions-of-epel-packag.patch |   56 --------------------
 ...d-the-uneeded-dependency-on-Crypto.Random.patch |   48 -----------------
 0004-Avoid-NULLs-in-crypto-padding.patch           |   47 ----------------
 openstack-glance.spec                              |   21 +++-----
 sources                                            |    2 +-
 8 files changed, 19 insertions(+), 200 deletions(-)
---
diff --git a/0005-Remove-runtime-dep-on-python-pbr.patch b/0001-Remove-runtime-dep-on-python-pbr.patch
similarity index 85%
rename from 0005-Remove-runtime-dep-on-python-pbr.patch
rename to 0001-Remove-runtime-dep-on-python-pbr.patch
index 7ba3d5b..22e65a0 100644
--- a/0005-Remove-runtime-dep-on-python-pbr.patch
+++ b/0001-Remove-runtime-dep-on-python-pbr.patch
@@ -1,11 +1,11 @@
-From 9ae2f0f579a866ca9dc4924b3f764bd41fb27208 Mon Sep 17 00:00:00 2001
+From a641471b59ad0dde22d4d5f83ffb329c3ea0b39a Mon Sep 17 00:00:00 2001
 From: John Bresnahan <jbresnah at redhat.com>
 Date: Wed, 18 Sep 2013 19:18:43 -1000
 Subject: [PATCH] Remove runtime dep on python pbr
 
 ---
- glance/version.py |   29 +++++++++++++++++++++++++++--
- 1 files changed, 27 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..9e20ed0 100644
diff --git a/0006-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch b/0002-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
similarity index 70%
rename from 0006-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
rename to 0002-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
index 8cbf3cb..4af8fe5 100644
--- a/0006-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
+++ b/0002-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
@@ -1,19 +1,19 @@
-From 79fbd448c874af8d3c9c921dd5e0a4e239badfe7 Mon Sep 17 00:00:00 2001
+From 7aa263bca163ee806dffcd24ce0b75a6f5c5eefc Mon Sep 17 00:00:00 2001
 From: John Bresnahan <jbresnah at redhat.com>
 Date: Wed, 18 Sep 2013 19:19:21 -1000
 Subject: [PATCH] Revert use oslo.sphinx and remove local copy of doc
 
 ---
- doc/source/conf.py    |    1 -
- test-requirements.txt |    3 ---
- 2 files changed, 0 insertions(+), 4 deletions(-)
+ doc/source/conf.py    | 1 -
+ test-requirements.txt | 3 ---
+ 2 files changed, 4 deletions(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 8ceeb43..d1eb08e 100644
+index 04f4ebe..b8d2ac8 100644
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
-@@ -46,7 +46,6 @@ extensions = ['sphinx.ext.coverage',
-               'sphinx.ext.ifconfig',
+@@ -47,7 +47,6 @@ extensions = ['sphinx.ext.coverage',
+               'sphinx.ext.intersphinx',
                'sphinx.ext.pngmath',
                'sphinx.ext.graphviz',
 -              'oslo.sphinx',
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 7c7f8db..08bfa5d 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,14 +1,14 @@
 %global release_name havana
 
 Name:             openstack-glance
-Version:          2013.2.1
+Version:          2013.2.2
 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}/%{version}/+download/glance-%{version}.tar.gz
+Source0:          https://launchpad.net/glance/havana/%{version}/+download/glance-%{version}.tar.gz
 Source1:          openstack-glance-api.init
 Source100:        openstack-glance-api.upstart
 Source2:          openstack-glance-registry.init
@@ -23,14 +23,10 @@ Source7:          glance-cache-dist.conf
 Source8:          glance-scrubber-dist.conf
 
 #
-# patches_base=2013.2.1
+# patches_base=2013.2.2
 #
-Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
-Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
-Patch0003: 0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
-Patch0004: 0004-Avoid-NULLs-in-crypto-padding.patch
-Patch0005: 0005-Remove-runtime-dep-on-python-pbr.patch
-Patch0006: 0006-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
+Patch0001: 0001-Remove-runtime-dep-on-python-pbr.patch
+Patch0002: 0002-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
 
 BuildArch:        noarch
 BuildRequires:    python2-devel
@@ -121,10 +117,6 @@ This package contains documentation files for glance.
 
 %patch0001 -p1
 %patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
 
 
 # Remove bundled egg-info
@@ -338,6 +330,9 @@ fi
 %doc doc/build/html
 
 %changelog
+* Fri Feb 14 2014 Flavio Percoco <flavio at redhat.com> 2013.2.2-1
+- Update to Havana stable release 2013.2.2
+
 * Wed Dec 18 2013 Pádraig Brady <pbrady at redhat.com> 2013.2.1-1
 - Update to Havana stable release 2013.2.1
 
diff --git a/sources b/sources
index 4261b64..9d90e02 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4d0acfdcfea06947283fe3c877f64011  glance-2013.2.1.tar.gz
+5df9916fd7feb72daec249fc0b6778d9  glance-2013.2.2.tar.gz