[openstack-glance/el6-havana] update to Havana GA
Pádraig Brady
pbrady at fedoraproject.org
Fri Oct 18 13:16:22 UTC 2013
commit bbf535bb97b4fbcf1771a3dae485964611f8493d
Author: Pádraig Brady <P at draigBrady.com>
Date: Fri Oct 18 14:08:30 2013 +0100
update to Havana GA
Conflicts:
openstack-glance.spec
.gitignore | 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 +-
...-oslo.sphinx-and-remove-local-copy-of-doc.patch | 2 +-
openstack-glance.spec | 13 ++++++++-----
sources | 2 +-
9 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d16421..d888c3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/glance-2013.2.b2.tar.gz
/glance-2013.2.b3.tar.gz
/glance-2013.2.rc1.tar.gz
+/glance-2013.2.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 75e07fd..ade755d 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 62762288220b200bf4437e8aacf7dd620feebf09 Mon Sep 17 00:00:00 2001
+From 4498d7cd7601e40b9ef0650464e014a508959ca5 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 d12997b..8ba102c 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 6b96fb8b7c8620c7c8794702d94bb6ebc1351b08 Mon Sep 17 00:00:00 2001
+From d16d197e7ed21685426cfdeb0bd3d564a2b73a18 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 69cb777..375c96c 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 4402116b8113963367280165b14757eb8ebf8d22 Mon Sep 17 00:00:00 2001
+From 8805be90557ec09eefe85b4084c343601ac5d648 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 1b3f53e..67f910e 100644
--- a/0004-Avoid-NULLs-in-crypto-padding.patch
+++ b/0004-Avoid-NULLs-in-crypto-padding.patch
@@ -1,4 +1,4 @@
-From 0a2e6345f7fa3a26919eea939e79d0424c8a0249 Mon Sep 17 00:00:00 2001
+From 2855e07c2e27d0d5536937754252ede8a84a2b70 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 017b616..0bc1705 100644
--- a/0005-Remove-runtime-dep-on-python-pbr.patch
+++ b/0005-Remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From b7ed00e7dbd16893b34f79771c9e95be6768c1ec Mon Sep 17 00:00:00 2001
+From 5e948b6ecccb2b195e680b8d92308ddc8ccb2c23 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-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch b/0006-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
index 6fc0f08..d44db83 100644
--- a/0006-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
+++ b/0006-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
@@ -1,4 +1,4 @@
-From 5c4ad24ce5fbcaa5a16d9c3d0ba24add00bb7bb4 Mon Sep 17 00:00:00 2001
+From 695366fa83562b5ba3db8e0204fe1d26603b1630 Mon Sep 17 00:00:00 2001
From: John Bresnahan <jbresnah at redhat.com>
Date: Wed, 18 Sep 2013 19:19:21 -1000
Subject: [PATCH] Revert use oslo.sphinx and remove local copy of doc
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 0ae8d24..7ab42de 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -2,13 +2,13 @@
Name: openstack-glance
Version: 2013.2
-Release: 0.12.rc1%{?dist}
+Release: 1%{?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}-rc1/+download/glance-%{version}.rc1.tar.gz
+Source0: https://launchpad.net/glance/%{release_name}/%{release_name}-rc1/+download/glance-%{version}.tar.gz
Source1: openstack-glance-api.init
Source100: openstack-glance-api.upstart
Source2: openstack-glance-registry.init
@@ -23,7 +23,7 @@ Source7: glance-cache-dist.conf
Source8: glance-scrubber-dist.conf
#
-# patches_base=2013.2.rc1
+# patches_base=2013.2
#
Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -117,8 +117,8 @@ and delivery services for virtual disk images.
This package contains documentation files for glance.
%prep
-%setup -q -n glance-%{version}.rc1
-sed -i 's/%{version}.rc1/%{version}/' PKG-INFO
+%setup -q -n glance-%{version}
+
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@@ -338,6 +338,9 @@ fi
%doc doc/build/html
%changelog
+* Fri Oct 18 2013 Pádraig Brady <pbrady at redhat.com> 2013.2-1
+- Update to Havana GA
+
* Thu Oct 03 2013 Pádraig Brady <pbrady at redhat.com> 2013.2-0.12.rc1
- Update to 2013.2.rc1
- Fixup various config file issues
diff --git a/sources b/sources
index 7710ce9..e286096 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e313b5d3d55744b24770e5674ee3e172 glance-2013.2.rc1.tar.gz
+07b2f962d5d1436d32692692bc37f2ed glance-2013.2.tar.gz
More information about the scm-commits
mailing list