[openstack-glance/el6-havana] update to Havana stable release 2013.2.3
Pádraig Brady
pbrady at fedoraproject.org
Thu Apr 10 12:37:28 UTC 2014
commit 3b9e842f128287faf38a7f84791e4703f7cbe8bd
Author: Pádraig Brady <P at draigBrady.com>
Date: Thu Apr 10 13:25:58 2014 +0100
update to Havana stable release 2013.2.3
.gitignore | 2 +
...-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 +-
...-oslo.sphinx-and-remove-local-copy-of-doc.patch | 33 --------------------
openstack-glance.spec | 16 +++++----
sources | 2 +-
9 files changed, 17 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 041821e..0c6b1ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
/glance-2013.2.rc1.tar.gz
/glance-2013.2.tar.gz
/glance-2013.2.1.tar.gz
+/glance-2013.2.2.tar.gz
+/glance-2013.2.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 8186bcb..940acaf 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 1f7fbaf4057ea941711760e3b3ca7fdded2ec24e Mon Sep 17 00:00:00 2001
+From 505db25b1d219128c3dc3ea15be82ea828cb9668 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 1e910a4..0ae600e 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 2843769c4647dbf754a18a533cdc2b5824c98f25 Mon Sep 17 00:00:00 2001
+From 6e2e84ba5113ab55189aeec238d7ff7d2408c870 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 1d9e423..eb131f8 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 ed2cf205f7e7de82658435a39704449584bc612b Mon Sep 17 00:00:00 2001
+From 057f8028e3215486d55666c014fd5ae9e14313f8 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 15fa8cd..683367d 100644
--- a/0004-Avoid-NULLs-in-crypto-padding.patch
+++ b/0004-Avoid-NULLs-in-crypto-padding.patch
@@ -1,4 +1,4 @@
-From 2ea0cc58cfc67762628724cb93357ced92c038a0 Mon Sep 17 00:00:00 2001
+From 985d7c9aff1f109f3494587d68ae1c80183f99de 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 d71df98..16ebca1 100644
--- a/0005-Remove-runtime-dep-on-python-pbr.patch
+++ b/0005-Remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From d9e9fe86086922f66c9b578f44f0a3c0a2a91028 Mon Sep 17 00:00:00 2001
+From 6a05188cdd43d9cdd9d036f07f93155a4fd2a0bf 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 5600607..2c1855c 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,8 +1,8 @@
%global release_name havana
Name: openstack-glance
-Version: 2013.2.2
-Release: 2%{?dist}
+Version: 2013.2.3
+Release: 1%{?dist}
Summary: OpenStack Image Service
Group: Applications/System
@@ -23,14 +23,13 @@ Source7: glance-cache-dist.conf
Source8: glance-scrubber-dist.conf
#
-# patches_base=2013.2.2
+# patches_base=2013.2.3
#
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
@@ -124,9 +123,6 @@ This package contains documentation files for glance.
%patch0003 -p1
%patch0004 -p1
%patch0005 -p1
-%patch0006 -p1
-
-
# Remove bundled egg-info
rm -rf glance.egg-info
sed -i '/\/usr\/bin\/env python/d' glance/common/config.py glance/common/crypt.py glance/db/sqlalchemy/migrate_repo/manage.py
@@ -138,6 +134,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
@@ -338,6 +337,9 @@ fi
%doc doc/build/html
%changelog
+* Thu Apr 10 2014 Pádraig Brady <pbrady at redhat.com> - 2013.2.3-1
+- Update to Havana stable release 2013.2.3
+
* Wed Feb 19 2014 Flavio Percoco <flavio at redhat.com> 2013.2.2-2
- Update to Havana stable release 2013.2.2
diff --git a/sources b/sources
index 9d90e02..2622038 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5df9916fd7feb72daec249fc0b6778d9 glance-2013.2.2.tar.gz
+385aea03a638948cba4a068fe8fa0eca glance-2013.2.3.tar.gz
More information about the scm-commits
mailing list