[openstack-glance/f20] Update to stable havana 2013.2.2
Flavio Percoco
flaper87 at fedoraproject.org
Fri Feb 14 10:41:01 UTC 2014
commit 3fc4ec6bd91c683b0e9737170f8ee9b9875548a0
Author: Flavio Percoco <flaper87 at gmail.com>
Date: Fri Feb 14 11:40:51 2014 +0100
Update to stable havana 2013.2.2
.gitignore | 1 +
... => 0001-Remove-runtime-dep-on-python-pbr.patch | 6 +++---
...-oslo.sphinx-and-remove-local-copy-of-doc.patch | 14 +++++++-------
...-Don-t-access-the-net-while-building-docs.patch | 10 +++++-----
openstack-glance.spec | 13 ++++++++-----
sources | 2 +-
6 files changed, 25 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 041821e..5f9415c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/glance-2013.2.rc1.tar.gz
/glance-2013.2.tar.gz
/glance-2013.2.1.tar.gz
+/glance-2013.2.2.tar.gz
diff --git a/0002-Remove-runtime-dep-on-python-pbr.patch b/0001-Remove-runtime-dep-on-python-pbr.patch
similarity index 85%
rename from 0002-Remove-runtime-dep-on-python-pbr.patch
rename to 0001-Remove-runtime-dep-on-python-pbr.patch
index 05d044c..56ecef6 100644
--- a/0002-Remove-runtime-dep-on-python-pbr.patch
+++ b/0001-Remove-runtime-dep-on-python-pbr.patch
@@ -1,11 +1,11 @@
-From 7b7c0a5c2866212e5c4aaa914373c2fdb54fbe35 Mon Sep 17 00:00:00 2001
+From d6493b446a0d883582dfcb51e07065e447046e38 Mon Sep 17 00:00:00 2001
From: John Bresnahan <jbresnah at redhat.com>
Date: Wed, 18 Sep 2013 16:43:45 -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/0003-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 0003-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 77d4783..c334a73 100644
--- a/0003-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 bf827dec236f5a2549748fd3e3b2f70ebce77969 Mon Sep 17 00:00:00 2001
+From 01b8172cd54091052143cc72be8b6b8f08f2d4a5 Mon Sep 17 00:00:00 2001
From: John Bresnahan <jbresnah at redhat.com>
Date: Wed, 18 Sep 2013 16:44:47 -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/0001-Don-t-access-the-net-while-building-docs.patch b/0003-Don-t-access-the-net-while-building-docs.patch
similarity index 78%
rename from 0001-Don-t-access-the-net-while-building-docs.patch
rename to 0003-Don-t-access-the-net-while-building-docs.patch
index 97893da..13c6aa7 100644
--- a/0001-Don-t-access-the-net-while-building-docs.patch
+++ b/0003-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From b465c7040f2c8cacd678b1c1ed6557e9cc6eb026 Mon Sep 17 00:00:00 2001
+From 23c18497914a484b9eba007bc8d58e704d34f1d4 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
@@ -8,11 +8,11 @@ Subject: [PATCH] Don't access the net while building docs
Change-Id: I42c6e3a5062db209a0abe00cebc04d383c79cbcb
(cherry picked from commit f2b4bb4e45afcc178200966193a7b87401c534d7)
---
- doc/source/conf.py | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ doc/source/conf.py | 1 -
+ 1 file changed, 1 deletion(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 04f4ebe..8ceeb43 100644
+index b8d2ac8..d1eb08e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -44,7 +44,6 @@ sys.path = [
@@ -22,4 +22,4 @@ index 04f4ebe..8ceeb43 100644
- 'sphinx.ext.intersphinx',
'sphinx.ext.pngmath',
'sphinx.ext.graphviz',
- 'oslo.sphinx',
+ ]
diff --git a/openstack-glance.spec b/openstack-glance.spec
index d662730..e7cc7a6 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,5 +1,5 @@
Name: openstack-glance
-Version: 2013.2.1
+Version: 2013.2.2
Release: 1%{?dist}
Summary: OpenStack Image Service
@@ -18,11 +18,11 @@ 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-Remove-runtime-dep-on-python-pbr.patch
-Patch0003: 0003-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
+Patch0003: 0003-Don-t-access-the-net-while-building-docs.patch
BuildArch: noarch
BuildRequires: python2-devel
@@ -318,6 +318,9 @@ fi
%doc doc/build/html
%changelog
+* Fri Feb 14 2015 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
More information about the scm-commits
mailing list