[openstack-glance/el6-icehouse] update to icehouse milestone 1
Pádraig Brady
pbrady at fedoraproject.org
Tue Dec 24 12:36:41 UTC 2013
commit 36a871c73043bcff15e55217c3bf617bbb8a9445
Author: Pádraig Brady <P at draigBrady.com>
Date: Tue Dec 24 12:01:54 2013 +0000
update to icehouse milestone 1
.gitignore | 15 +--------
...-Don-t-access-the-net-while-building-docs.patch | 2 +-
...-parallel-install-versions-of-epel-packag.patch | 4 +-
...d-the-uneeded-dependency-on-Crypto.Random.patch | 4 +-
0004-Avoid-NULLs-in-crypto-padding.patch | 4 +-
0005-Remove-runtime-dep-on-python-pbr.patch | 2 +-
...-oslo.sphinx-and-remove-local-copy-of-doc.patch | 33 --------------------
openstack-glance.spec | 17 ++++++----
sources | 2 +-
9 files changed, 20 insertions(+), 63 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 041821e..ec029e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1 @@
-/glance-2012.2.tar.gz
-/glance-2013.1~g1.tar.gz
-/glance-2013.1~g2.tar.gz
-/glance-2013.1.g3.tar.gz
-/glance-2013.1.rc1.tar.gz
-/glance-2013.1.rc2.tar.gz
-/glance-2013.1.tar.gz
-/glance-2013.1.2.tar.gz
-/glance-2013.2.b1.tar.gz
-/glance-2013.2.b2.tar.gz
-/glance-2013.2.b3.tar.gz
-/glance-2013.2.rc1.tar.gz
-/glance-2013.2.tar.gz
-/glance-2013.2.1.tar.gz
+/glance-2014.1.b1.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 3cb3aa8..dcc3726 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 17846d25022337153b38dc2e013232e89a0ea403 Mon Sep 17 00:00:00 2001
+From 9d8d412e5641371cc896a0fda18b064f6ef713c3 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
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 43f67cd..885a447 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 ff35c2dd0a0dbc15a7c92e0c0e80bda29a94f757 Mon Sep 17 00:00:00 2001
+From d5b59bee3a81878486eb7365ae0ac82bdf774107 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
@@ -15,7 +15,7 @@ system default module versions.
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/glance/__init__.py b/glance/__init__.py
-index b606957..dd75292 100644
+index c43a900..625552c 100644
--- a/glance/__init__.py
+++ b/glance/__init__.py
@@ -14,3 +14,35 @@
diff --git a/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch b/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
index b98df40..f191869 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 87396a965793986c605e45909dfb4e5cf280b461 Mon Sep 17 00:00:00 2001
+From f55675bb535baaef1ba78db4cb332a42e24a491a 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
@@ -16,7 +16,7 @@ http://eli.thegreenplace.net/2010/06/25/aes-encryption-of-files-in-python-with-p
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/glance/common/crypt.py b/glance/common/crypt.py
-index ee5f2dd..ef6496b 100644
+index ee50544..8412717 100644
--- a/glance/common/crypt.py
+++ b/glance/common/crypt.py
@@ -21,10 +21,7 @@ Routines for URL-safe encrypting/decrypting
diff --git a/0004-Avoid-NULLs-in-crypto-padding.patch b/0004-Avoid-NULLs-in-crypto-padding.patch
index 0c7c1df..3d30fa5 100644
--- a/0004-Avoid-NULLs-in-crypto-padding.patch
+++ b/0004-Avoid-NULLs-in-crypto-padding.patch
@@ -1,4 +1,4 @@
-From 9d7b54db71c6ce2269063c42baacaa79bc158afc Mon Sep 17 00:00:00 2001
+From d53ac28fcaefa2e0f81784b10ef6020e1d4ddcf1 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.
@@ -21,7 +21,7 @@ Tested-by: Nikola Dipanov <ndipanov at redhat.com>
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/glance/common/crypt.py b/glance/common/crypt.py
-index ef6496b..3874de7 100644
+index 8412717..5ea7c59 100644
--- a/glance/common/crypt.py
+++ b/glance/common/crypt.py
@@ -21,6 +21,10 @@ Routines for URL-safe encrypting/decrypting
diff --git a/0005-Remove-runtime-dep-on-python-pbr.patch b/0005-Remove-runtime-dep-on-python-pbr.patch
index 7ba3d5b..3de2dea 100644
--- a/0005-Remove-runtime-dep-on-python-pbr.patch
+++ b/0005-Remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 9ae2f0f579a866ca9dc4924b3f764bd41fb27208 Mon Sep 17 00:00:00 2001
+From 4e7ff2caf35014901e3fdeb8e551f4b7f702bbad 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
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 7c7f8db..9361dce 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,14 +1,14 @@
%global release_name havana
Name: openstack-glance
-Version: 2013.2.1
-Release: 1%{?dist}
+Version: 2014.1
+Release: 0.1.b1%{?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/%{release_name}/%{version}/+download/glance-%{version}.b1.tar.gz
Source1: openstack-glance-api.init
Source100: openstack-glance-api.upstart
Source2: openstack-glance-registry.init
@@ -23,14 +23,13 @@ Source7: glance-cache-dist.conf
Source8: glance-scrubber-dist.conf
#
-# patches_base=2013.2.1
+# patches_base=2014.1.b1
#
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
BuildArch: noarch
BuildRequires: python2-devel
@@ -42,6 +41,7 @@ BuildRequires: python-routes1.12
BuildRequires: python-sqlalchemy0.7
BuildRequires: python-webob1.2
BuildRequires: python-pbr
+BuildRequires: python-oslo-sphinx
Requires(post): chkconfig
Requires(preun): initscripts
@@ -84,6 +84,7 @@ Requires: python-swiftclient
Requires: python-cinderclient
Requires: python-keystoneclient
Requires: python-oslo-config >= 1:1.2.0
+Requires: python-oslo-messaging
Requires: python-qpid
#test deps: python-mox python-nose python-requests
@@ -117,14 +118,13 @@ and delivery services for virtual disk images.
This package contains documentation files for glance.
%prep
-%setup -q -n glance-%{version}
+%setup -q -n glance-%{version}.b1
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
%patch0004 -p1
%patch0005 -p1
-%patch0006 -p1
# Remove bundled egg-info
@@ -338,6 +338,9 @@ fi
%doc doc/build/html
%changelog
+* Mon Dec 23 2013 Pádraig Brady <pbrady at redhat.com> 2014.1-0.1.b1
+- Update to Icehouse milestone 1
+
* 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..c8bbe9c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4d0acfdcfea06947283fe3c877f64011 glance-2013.2.1.tar.gz
+95cfc14cc28f08d5a6f6ea96daafc55e glance-2014.1.b1.tar.gz
More information about the scm-commits
mailing list