[openstack-glance/el6-grizzly] Bump to version 2013.1.2
John Bresnahan
buzztroll at fedoraproject.org
Mon Aug 12 22:10:04 UTC 2013
commit 076a1d5c709bf4e2ceb569f0193eedc62fbe633f
Author: John Bresnahan <jbresnah at redhat.com>
Date: Mon Aug 12 11:54:06 2013 -1000
Bump to version 2013.1.2
Updated patches from el6-grizzly-patches
.gitignore | 1 +
...-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 +++---
openstack-glance.spec | 11 +++++++----
sources | 2 +-
7 files changed, 21 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 20bd9ae..8d76dff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/glance-2013.1.rc2.tar.gz
/glance-2013.1.tar.gz
/glance-2013.1.2.tar.gz
+/glance-2013.1.3.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 cf54a0f..92d2705 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 df7772cffe973b65a717219251ffeb935d10a3fc Mon Sep 17 00:00:00 2001
+From a0e11f9d4638f9443afd3496188d3d753e0b3ca5 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 8b546d6..4d73f0d 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 6524d60..2ae4a6c 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 6d09c0dae260bba758f05609fcb7006ebb9286d3 Mon Sep 17 00:00:00 2001
+From 30a3d37a9fd3b1d93062066842077fba64b033f8 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:37:12 +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 | 28 ++++++++++++++++++++++++++++
- 1 files changed, 28 insertions(+), 0 deletions(-)
+ glance/__init__.py | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
diff --git a/glance/__init__.py b/glance/__init__.py
index b6d314b..86ec0ab 100644
diff --git a/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch b/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
index 9c59f0c..1f24662 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 716056eca710d50d9c5d53833f4def0ac6969d37 Mon Sep 17 00:00:00 2001
+From 052558022ae6997c4ca0d1ae495ff719f192550e 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 5582b1b..192aeb0 100644
--- a/0004-Avoid-NULLs-in-crypto-padding.patch
+++ b/0004-Avoid-NULLs-in-crypto-padding.patch
@@ -1,4 +1,4 @@
-From 3fc73f66f23bf05c7b32d9da087dba48780f23a5 Mon Sep 17 00:00:00 2001
+From edde0a74bf66ef6972153148cc88e9e33f6503b3 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 9578259..8e2fd23 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,12 +1,12 @@
Name: openstack-glance
-Version: 2013.1.2
-Release: 4%{?dist}
+Version: 2013.1.3
+Release: 1%{?dist}
Summary: OpenStack Image Service
Group: Applications/System
License: ASL 2.0
URL: http://glance.openstack.org
-Source0: https://launchpad.net/glance/grizzly/2013.1/+download/glance-2013.1.2.tar.gz
+Source0: https://launchpad.net/glance/grizzly/2013.1.3/+download/glance-2013.1.3.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.1.2
+# patches_base=2013.1.3
#
Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -296,6 +296,9 @@ fi
%doc doc/build/html
%changelog
+* Mon Aug 12 2013 John Bresnahan <jbresnah at redhat.com> 2013.1.3-1
+- Update to 2013.1.3
+
* Tue Jul 23 2013 John Bresnahan <jbresnah at redhat.com> 2013.1.2-4
- Do not log DEBUG by default
- Do not distribute tests
diff --git a/sources b/sources
index c745516..2ab609f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3368425f52b072e83eefcf1e65f38564 glance-2013.1.2.tar.gz
+f9ba3865ff2cf98caa471bd54173fecd glance-2013.1.3.tar.gz
More information about the scm-commits
mailing list