[openstack-glance/el6-icehouse] update to Icehouse release candidate 1
Pádraig Brady
pbrady at fedoraproject.org
Wed Apr 9 09:46:38 UTC 2014
commit c246c8bfe76cfbba03636e03b1d56951173d603c
Author: Pádraig Brady <P at draigBrady.com>
Date: Wed Apr 9 10:43:30 2014 +0100
update to Icehouse release candidate 1
...-Don-t-access-the-net-while-building-docs.patch | 2 +-
...-parallel-install-versions-of-epel-packag.patch | 2 +-
...d-the-uneeded-dependency-on-Crypto.Random.patch | 2 +-
0004-Avoid-NULLs-in-crypto-padding.patch | 2 +-
0005-Remove-runtime-dep-on-python-pbr.patch | 2 +-
0006-Revert-Switch-over-to-oslosphinx.patch | 34 ------------
0006-avoid-unsupported-storage-drivers.patch | 55 ++++++++++++++++++++
0007-unconfigure-unsupported-storage-drivers.patch | 53 -------------------
openstack-glance.spec | 18 ++++---
9 files changed, 71 insertions(+), 99 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 18b72cc..d5b8290 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 8e80441b674bbf282a9eeb3c63443f85bd6ab92f Mon Sep 17 00:00:00 2001
+From 38499d76b3fb9aa27080c8790d2cfb613ddee880 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 d426f8a..a39e0bf 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 8786284a4846473ddcfe45c967e2021e2ba023a5 Mon Sep 17 00:00:00 2001
+From 1d9f1e14dff41ac9808d1fc055237e5056de6c72 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
diff --git a/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch b/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
index a4a099d..c034de2 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 8511564cc277efaef8dabac41d371750aace1417 Mon Sep 17 00:00:00 2001
+From 99e2525884a59346c83ad2937d247bcef456bf19 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
diff --git a/0004-Avoid-NULLs-in-crypto-padding.patch b/0004-Avoid-NULLs-in-crypto-padding.patch
index 8d8ac8e..d51264f 100644
--- a/0004-Avoid-NULLs-in-crypto-padding.patch
+++ b/0004-Avoid-NULLs-in-crypto-padding.patch
@@ -1,4 +1,4 @@
-From f34471675aceee46cebeda1e2dd33ae6e0716b3d Mon Sep 17 00:00:00 2001
+From 7280ec716e308e405e452e00cd18a4a7dfedbec2 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.
diff --git a/0005-Remove-runtime-dep-on-python-pbr.patch b/0005-Remove-runtime-dep-on-python-pbr.patch
index 0f508ea..6922382 100644
--- a/0005-Remove-runtime-dep-on-python-pbr.patch
+++ b/0005-Remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 2107e522ecd0565a3f65b1a7a422ec93aaf8a7e4 Mon Sep 17 00:00:00 2001
+From 250c30f6cc717f63e49962b9effb71a5bae7e8b6 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/0006-avoid-unsupported-storage-drivers.patch b/0006-avoid-unsupported-storage-drivers.patch
new file mode 100644
index 0000000..75ab80e
--- /dev/null
+++ b/0006-avoid-unsupported-storage-drivers.patch
@@ -0,0 +1,55 @@
+From 0456c5a976e8d6057e4c48d3a49690b5970abdd2 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(-)
+
+diff --git a/etc/glance-api.conf b/etc/glance-api.conf
+index 12eca91..218e47d 100644
+--- a/etc/glance-api.conf
++++ b/etc/glance-api.conf
+@@ -17,10 +17,8 @@ default_store = file
+ # glance.store.rbd.Store,
+ # glance.store.s3.Store,
+ # glance.store.swift.Store,
+-# glance.store.sheepdog.Store,
+ # glance.store.cinder.Store,
+ # glance.store.gridfs.Store,
+-# glance.store.vmware_datastore.Store,
+ #known_stores = glance.store.filesystem.Store,
+ # glance.store.http.Store
+
+diff --git a/etc/glance-cache.conf b/etc/glance-cache.conf
+index 0246b67..04e5623 100644
+--- a/etc/glance-cache.conf
++++ b/etc/glance-cache.conf
+@@ -44,9 +44,7 @@ registry_port = 9191
+ # glance.store.rbd.Store,
+ # glance.store.s3.Store,
+ # glance.store.swift.Store,
+-# glance.store.sheepdog.Store,
+ # glance.store.cinder.Store,
+-# glance.store.vmware_datastore.Store,
+
+ # ============ Filesystem Store Options ========================
+
+diff --git a/glance/store/__init__.py b/glance/store/__init__.py
+index 33a67d6..7af3813 100644
+--- a/glance/store/__init__.py
++++ b/glance/store/__init__.py
+@@ -69,10 +69,8 @@ _ALL_STORES = [
+ 'glance.store.rbd.Store',
+ 'glance.store.s3.Store',
+ 'glance.store.swift.Store',
+- 'glance.store.sheepdog.Store',
+ 'glance.store.cinder.Store',
+ 'glance.store.gridfs.Store',
+- 'glance.store.vmware_datastore.Store'
+ ]
+
+
diff --git a/openstack-glance.spec b/openstack-glance.spec
index e3c8402..03cc197 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -2,13 +2,13 @@
Name: openstack-glance
Version: 2014.1
-Release: 0.4.b3%{?dist}
+Release: 0.5.rc1%{?dist}
Summary: OpenStack Image Service
Group: Applications/System
License: ASL 2.0
URL: http://glance.openstack.org
-Source0: https://launchpad.net/glance/%{release_name}/%{release_name}-3/+download/glance-%{version}.b3.tar.gz
+Source0: https://launchpad.net/glance/%{release_name}/%{release_name}-3/+download/glance-%{version}.rc1.tar.gz
Source1: openstack-glance-api.init
Source100: openstack-glance-api.upstart
Source2: openstack-glance-registry.init
@@ -23,15 +23,14 @@ Source7: glance-cache-dist.conf
Source8: glance-scrubber-dist.conf
#
-# patches_base=2014.1.b3
+# patches_base=2014.1.rc1
#
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-Switch-over-to-oslosphinx.patch
-Patch0007: 0007-unconfigure-unsupported-storage-drivers.patch
+Patch0006: 0006-avoid-unsupported-storage-drivers.patch
BuildArch: noarch
BuildRequires: python2-devel
@@ -121,7 +120,7 @@ and delivery services for virtual disk images.
This package contains documentation files for glance.
%prep
-%setup -q -n glance-%{version}.b3
+%setup -q -n glance-%{version}.rc1
%patch0001 -p1
%patch0002 -p1
@@ -129,7 +128,6 @@ This package contains documentation files for glance.
%patch0004 -p1
%patch0005 -p1
%patch0006 -p1
-%patch0007 -p1
# Remove bundled egg-info
@@ -143,6 +141,9 @@ sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
sed -i s/REDHATGLANCEVERSION/%{version}/ glance/version.py
sed -i s/REDHATGLANCERELEASE/%{release}/ glance/version.py
+# make doc build compatible with python-oslo-sphinx RPM
+sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
+
# Remove the requirements file so that pbr hooks don't add it
# to distutils requiers_dist config
rm -rf {test-,}requirements.txt tools/{pip,test}-requires
@@ -343,6 +344,9 @@ fi
%doc doc/build/html
%changelog
+* Wed Apr 09 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.5.rc1
+- Latest upstream
+
* Mon Mar 24 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.4.b3
- unconfigure unsupported storage drivers
More information about the scm-commits
mailing list