[openstack-nova/el6-havana] Update to Havan RC2
Nikola Dipanov
ndipanov at fedoraproject.org
Tue Oct 15 16:52:05 UTC 2013
commit f0921f7b9c5593de7a1a0c6ad9b17d13535afd14
Author: Nikola Dipanov <ndipanov at redhat.com>
Date: Tue Oct 15 18:11:05 2013 +0200
Update to Havan RC2
.gitignore | 1 +
...e-don-t-access-the-net-when-building-docs.patch | 2 +-
0002-remove-runtime-dep-on-python-pbr.patch | 2 +-
...oslo.sphinx-and-remove-local-copy-of-doc-.patch | 2 +-
openstack-nova.spec | 11 +++++++----
sources | 2 +-
6 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8656182..10acc3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/nova-2013.2.b2.tar.gz
/nova-2013.2.b3.tar.gz
/nova-2013.2.rc1.tar.gz
+/nova-2013.2.rc2.tar.gz
diff --git a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
index e8e306f..6d0026d 100644
--- a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -1,4 +1,4 @@
-From aee3d852a84635ae1027ff383416afde4691e61d Mon Sep 17 00:00:00 2001
+From 7e9809c1d7ffbf3610b64dfeccb6484f79476884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Fri, 6 Jan 2012 12:16:34 +0000
Subject: [PATCH] Ensure we don't access the net when building docs
diff --git a/0002-remove-runtime-dep-on-python-pbr.patch b/0002-remove-runtime-dep-on-python-pbr.patch
index 43dbb63..4bf5fca 100644
--- a/0002-remove-runtime-dep-on-python-pbr.patch
+++ b/0002-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 58f9ba51158db75322e491adb9ef42e95754022e Mon Sep 17 00:00:00 2001
+From 6752d363a16a3eee4a8f90938f031bf6d599dce2 Mon Sep 17 00:00:00 2001
From: Nikola Dipanov <ndipanov at redhat.com>
Date: Fri, 14 Jun 2013 11:29:50 +0200
Subject: [PATCH] remove runtime dep on python-pbr
diff --git a/0003-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch b/0003-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
index 03e0a10..700fc70 100644
--- a/0003-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
+++ b/0003-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
@@ -1,4 +1,4 @@
-From d40362cca37193b45abc2a4cf8b4f96b3b5e0157 Mon Sep 17 00:00:00 2001
+From 7b69cb8bd3f0e352db5eb05700df91fcfa353a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
Date: Mon, 22 Jul 2013 03:30:48 +0100
Subject: [PATCH] Revert "Use oslo.sphinx and remove local copy of doc theme"
diff --git a/openstack-nova.spec b/openstack-nova.spec
index d38d824..a6c4764 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,13 +2,13 @@
Name: openstack-nova
Version: 2013.2
-Release: 0.25.rc1%{?dist}
+Release: 0.26.rc2%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
License: ASL 2.0
URL: http://openstack.org/projects/compute/
-Source0 https://launchpad.net/nova/havana/havana-rc1/+download/nova-%{version}.rc1.tar.gz
+Source0 https://launchpad.net/nova/havana/havana-rc2/+download/nova-%{version}.rc2.tar.gz
Source1: nova-dist.conf
Source6: nova.logrotate
@@ -50,7 +50,7 @@ Source22: nova-ifc-template
Source30: openstack-nova-novncproxy.sysconfig
#
-# patches_base=2013.2.rc1
+# patches_base=2013.2.rc2
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
Patch0002: 0002-remove-runtime-dep-on-python-pbr.patch
@@ -421,7 +421,7 @@ This package contains documentation files for nova.
%endif
%prep
-%setup -q -n nova-%{version}.rc1
+%setup -q -n nova-%{version}.rc2
%patch0001 -p1
%patch0002 -p1
@@ -927,6 +927,9 @@ fi
%endif
%changelog
+* Tue Oct 15 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.26.rc2
+- Update to Havana rc2
+
* Fri Oct 11 2013 Vladan Popovic <vpopovic at redhat.com> - 2013.2-0.25.rc1
- remove the -s option on qemu-img convert - rhbz#1016896
diff --git a/sources b/sources
index e3fb4dc..8652d78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-913ae27fea3b85aeafe80569a48a7062 nova-2013.2.rc1.tar.gz
+3b8c2888799d12d862b96db187972036 nova-2013.2.rc2.tar.gz
More information about the scm-commits
mailing list