[openstack-glance/el6-icehouse] Update to latest Icehouse release
Jon Bernard
jbernard at fedoraproject.org
Tue Jun 24 16:06:08 UTC 2014
commit bc4a960ff3aa82c606adebcd194c4c30db94a89c
Author: Jon Bernard <jobernar at redhat.com>
Date: Tue Jun 24 12:05:11 2014 -0400
Update to latest Icehouse release
...-Don-t-access-the-net-while-building-docs.patch | 6 +++---
...-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 +++---
0005-Remove-runtime-dep-on-python-pbr.patch | 6 +++---
0006-avoid-unsupported-storage-drivers.patch | 10 +++++-----
openstack-glance.spec | 9 ++++++---
7 files changed, 26 insertions(+), 23 deletions(-)
---
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 d5b8290..6c34662 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 38499d76b3fb9aa27080c8790d2cfb613ddee880 Mon Sep 17 00:00:00 2001
+From f8d38ee921ae6289a5e44d30ce59a98133c1b5eb 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,8 +8,8 @@ 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 2253323..fb2131e 100644
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 a39e0bf..c62dc50 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 1d9f1e14dff41ac9808d1fc055237e5056de6c72 Mon Sep 17 00:00:00 2001
+From e48b35ce4d50803ecc338165b37c52d79f3d481b 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 | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 48 insertions(+), 0 deletions(-)
+ glance/__init__.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 48 insertions(+)
diff --git a/glance/__init__.py b/glance/__init__.py
index e69de29..625552c 100644
diff --git a/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch b/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
index c034de2..44511b1 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 99e2525884a59346c83ad2937d247bcef456bf19 Mon Sep 17 00:00:00 2001
+From e813f9c50c101578c2b9bdfa4cc326c5fd3e0733 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 f719d11..971fe4f 100644
diff --git a/0004-Avoid-NULLs-in-crypto-padding.patch b/0004-Avoid-NULLs-in-crypto-padding.patch
index d51264f..795b14c 100644
--- a/0004-Avoid-NULLs-in-crypto-padding.patch
+++ b/0004-Avoid-NULLs-in-crypto-padding.patch
@@ -1,4 +1,4 @@
-From 7280ec716e308e405e452e00cd18a4a7dfedbec2 Mon Sep 17 00:00:00 2001
+From 9b22a5dfc1e6be25d22da2724f593150edc6a779 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 971fe4f..15f72b4 100644
diff --git a/0005-Remove-runtime-dep-on-python-pbr.patch b/0005-Remove-runtime-dep-on-python-pbr.patch
index 6922382..b4f709c 100644
--- a/0005-Remove-runtime-dep-on-python-pbr.patch
+++ b/0005-Remove-runtime-dep-on-python-pbr.patch
@@ -1,11 +1,11 @@
-From 250c30f6cc717f63e49962b9effb71a5bae7e8b6 Mon Sep 17 00:00:00 2001
+From 63d246625235475ad3337f343a6c491e4021f318 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 0172206..ac67472 100644
diff --git a/0006-avoid-unsupported-storage-drivers.patch b/0006-avoid-unsupported-storage-drivers.patch
index cd1a802..0740dee 100644
--- a/0006-avoid-unsupported-storage-drivers.patch
+++ b/0006-avoid-unsupported-storage-drivers.patch
@@ -1,13 +1,13 @@
-From 0456c5a976e8d6057e4c48d3a49690b5970abdd2 Mon Sep 17 00:00:00 2001
+From df715835191cab33dac1c313a212289ba2a62f1d 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
---
- etc/glance-api.conf | 2 --
- etc/glance-cache.conf | 2 --
- glance/store/__init__.py | 2 --
- 3 files changed, 0 insertions(+), 6 deletions(-)
+ etc/glance-api.conf | 2 --
+ etc/glance-cache.conf | 2 --
+ glance/store/__init__.py | 2 --
+ 3 files changed, 6 deletions(-)
diff --git a/etc/glance-api.conf b/etc/glance-api.conf
index 8b4bf66..c53be76 100644
diff --git a/openstack-glance.spec b/openstack-glance.spec
index faa933f..da6aec7 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,8 +1,8 @@
%global release_name icehouse
Name: openstack-glance
-Version: 2014.1
-Release: 2%{?dist}
+Version: 2014.1.1
+Release: 1%{?dist}
Summary: OpenStack Image Service
Group: Applications/System
@@ -23,7 +23,7 @@ Source7: glance-cache-dist.conf
Source8: glance-scrubber-dist.conf
#
-# patches_base=2014.1
+# patches_base=2014.1.1
#
Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -335,6 +335,9 @@ fi
%doc doc/build/html
%changelog
+* Tue Jun 24 2014 Jon Bernard <jobernar at redhat.com> - 2014.1.1-1
+- Update to latest Icehouse release
+
* Thu Apr 24 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-2
- Comment all default config items in /etc/glance/*.conf
More information about the scm-commits
mailing list