[openstack-glance/el6-havana] Rebase to 2013.2.b3
John Bresnahan
buzztroll at fedoraproject.org
Tue Sep 10 02:41:18 UTC 2013
commit d7410b6873f04792f7ce0a7879b338078973965c
Author: John Bresnahan <jbresnah at redhat.com>
Date: Mon Sep 9 16:26:49 2013 -1000
Rebase to 2013.2.b3
.gitignore | 1 +
...-Don-t-access-the-net-while-building-docs.patch | 12 ++++++------
...-parallel-install-versions-of-epel-packag.patch | 6 +++---
...d-the-uneeded-dependency-on-Crypto.Random.patch | 6 +++---
0004-Avoid-NULLs-in-crypto-padding.patch | 6 +++---
openstack-glance.spec | 13 ++++++++-----
sources | 2 +-
7 files changed, 25 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f273ffb..c870c65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/glance-2013.1.2.tar.gz
/glance-2013.2.b1.tar.gz
/glance-2013.2.b2.tar.gz
+/glance-2013.2.b3.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 0a080c2..198e255 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 72557f680e05c9a2becba850b605b14921ef9cff Mon Sep 17 00:00:00 2001
+From a73e8b1c6bc9c51356bf966d45d51d8d8162c37e 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 f926b61..68b9973 100644
+index 04f4ebe..8ceeb43 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -44,7 +44,6 @@ sys.path = [
@@ -21,5 +21,5 @@ index f926b61..68b9973 100644
'sphinx.ext.ifconfig',
- 'sphinx.ext.intersphinx',
'sphinx.ext.pngmath',
- 'sphinx.ext.graphviz']
-
+ 'sphinx.ext.graphviz',
+ 'oslo.sphinx',
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 5b786d3..2990091 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 ce93cbf7e66ffa8ea99fc70e7fbb11dfed048a5d Mon Sep 17 00:00:00 2001
+From 22ca4cbf6e12fc210ad7c3ec2e4afdc5f2b4a29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
Date: Tue, 23 Jul 2013 12:18:26 +0100
Subject: [PATCH] Use updated parallel install versions of epel package
@@ -11,8 +11,8 @@ Delve into pkg_resources a little to get it to modify sys.path,
so that our parallel installed egg takes precedence over the
system default module versions.
---
- glance/__init__.py | 32 ++++++++++++++++++++++++++++++++
- 1 files changed, 32 insertions(+), 0 deletions(-)
+ glance/__init__.py | 32 ++++++++++++++++++++++++++++++++
+ 1 file changed, 32 insertions(+)
diff --git a/glance/__init__.py b/glance/__init__.py
index b606957..dd75292 100644
diff --git a/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch b/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
index 54449d3..9ad18c1 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 290aebbea2d855ce272134db2e48c8e8d5baf1a5 Mon Sep 17 00:00:00 2001
+From f11475fdd723c9b08c5efc5d4412f2fa2940df00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
Date: Tue, 23 Jul 2013 12:19:45 +0100
Subject: [PATCH] avoid the uneeded dependency on Crypto.Random
@@ -12,8 +12,8 @@ but I'm leaving that as is for now:
http://www.codekoala.com/blog/2009/aes-encryption-python-using-pycrypto/#comment-25921785
http://eli.thegreenplace.net/2010/06/25/aes-encryption-of-files-in-python-with-pycrypto/
---
- glance/common/crypt.py | 8 ++------
- 1 files changed, 2 insertions(+), 6 deletions(-)
+ glance/common/crypt.py | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/glance/common/crypt.py b/glance/common/crypt.py
index ee5f2dd..ef6496b 100644
diff --git a/0004-Avoid-NULLs-in-crypto-padding.patch b/0004-Avoid-NULLs-in-crypto-padding.patch
index f471c80..9226f28 100644
--- a/0004-Avoid-NULLs-in-crypto-padding.patch
+++ b/0004-Avoid-NULLs-in-crypto-padding.patch
@@ -1,4 +1,4 @@
-From 408f653ac5298bfd7d91c65bba8f8b6686b6fa46 Mon Sep 17 00:00:00 2001
+From 27dcae6a1f9122c21fb0e71e1ddaed1d1ba1d84f Mon Sep 17 00:00:00 2001
From: Eoghan Glynn <eglynn at redhat.com>
Date: Wed, 30 Jan 2013 17:43:52 +0000
Subject: [PATCH] Avoid NULLs in crypto padding.
@@ -17,8 +17,8 @@ Reviewed-on: https://code.engineering.redhat.com/gerrit/2809
Reviewed-by: Nikola Dipanov <ndipanov at redhat.com>
Tested-by: Nikola Dipanov <ndipanov at redhat.com>
---
- glance/common/crypt.py | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
+ glance/common/crypt.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/glance/common/crypt.py b/glance/common/crypt.py
index ef6496b..3874de7 100644
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 08abe32..d90094d 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,12 +1,12 @@
Name: openstack-glance
Version: 2013.2
-Release: 0.6.b2%{?dist}
+Release: 0.7.b3%{?dist}
Summary: OpenStack Image Service
Group: Applications/System
License: ASL 2.0
URL: http://glance.openstack.org
-Source0: https://launchpad.net/glance/havana/havana-2/+download/glance-2013.2.b2.tar.gz
+Source0: https://launchpad.net/glance/havana/havana-3/+download/glance-2013.2.b3.tar.gz
Source1: openstack-glance-api.init
Source100: openstack-glance-api.upstart
Source2: openstack-glance-registry.init
@@ -16,7 +16,7 @@ Source300: openstack-glance-scrubber.upstart
Source4: openstack-glance.logrotate
#
-# patches_base=2013.2.b2
+# patches_base=2013.2.b3
#
Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -106,8 +106,8 @@ and delivery services for virtual disk images.
This package contains documentation files for glance.
%prep
-%setup -q -n glance-%{version}.b2
-sed -i 's/%{version}.b2/%{version}/' PKG-INFO
+%setup -q -n glance-%{version}.b3
+sed -i 's/%{version}.b3/%{version}/' PKG-INFO
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@@ -301,6 +301,9 @@ fi
%doc doc/build/html
%changelog
+* Mon Sep 9 2013 John Bresnahan <jbresnah at redhat.com> 2013.2.b3
+- Update to 2013.2.b3
+
* Tue Jul 23 2013 John Bresnahan <jbresnah at redhat.com> 2013.2-0.6.b2
- Do not log DEBUG by default
- Do not distribute tests
diff --git a/sources b/sources
index f21ac08..d8166d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b9a7986cdfd0eea4777b10eb7044bba7 glance-2013.2.b2.tar.gz
+a2801214a1c119a196cc75a5cabe7978 glance-2013.2.b3.tar.gz
More information about the scm-commits
mailing list