[openstack-nova] Update to Havana milestone 3
Nikola Dipanov
ndipanov at fedoraproject.org
Mon Sep 9 13:10:42 UTC 2013
commit 0207fd47c36c448c201e2fd9517fc1fce95b428e
Author: Nikola Dipanov <ndipanov at redhat.com>
Date: Mon Sep 9 10:53:51 2013 +0200
Update to Havana milestone 3
.gitignore | 1 +
...e-don-t-access-the-net-when-building-docs.patch | 6 ++--
0002-remove-runtime-dep-on-python-pbr.patch | 8 ++--
...oslo.sphinx-and-remove-local-copy-of-doc-.patch | 35 +++++++++-----------
openstack-nova.spec | 11 ++++--
sources | 2 +-
6 files changed, 32 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5b00b03..9c00753 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
/nova-2013.1.1.tar.gz
/nova-2013.2.b1.tar.gz
/nova-2013.2.b2.tar.gz
+/nova-2013.2.b3.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 2bd5a4d..e7b0e51 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 0bfe3b72b314a7dc9dcf8af95f8eacc7c090d7d0 Mon Sep 17 00:00:00 2001
+From f3a540af886c8045b8af7df7773828628f37bc03 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
@@ -7,8 +7,8 @@ Subject: [PATCH] Ensure we don't access the net when building docs
Change-Id: I9d02fb4053a8106672aded1614a2850e21603eb2
---
- doc/source/conf.py | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ doc/source/conf.py | 1 -
+ 1 file changed, 1 deletion(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 95126b6..43e972e 100644
diff --git a/0002-remove-runtime-dep-on-python-pbr.patch b/0002-remove-runtime-dep-on-python-pbr.patch
index 287bdcc..a9a8e8d 100644
--- a/0002-remove-runtime-dep-on-python-pbr.patch
+++ b/0002-remove-runtime-dep-on-python-pbr.patch
@@ -1,15 +1,15 @@
-From b01af28b39460a79f9fca9cba400aaf4ac96bd2e Mon Sep 17 00:00:00 2001
+From 055a32613c851b6704033f703c4012d10e9c3db8 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
Change-Id: I6f247f64c561d49c13e3c2f67401fe150b6d47b6
---
- nova/version.py | 17 ++++++++++++++---
- 1 files changed, 14 insertions(+), 3 deletions(-)
+ nova/version.py | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/nova/version.py b/nova/version.py
-index f954ef3..dcf3b7b 100644
+index 9a4c33c..100c7a5 100644
--- a/nova/version.py
+++ b/nova/version.py
@@ -14,14 +14,25 @@
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 863cb29..d1991e5 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,30 +1,27 @@
-From a8f62cb5797f4a87660abefe1561617c80dea337 Mon Sep 17 00:00:00 2001
+From 74d8ad31f9d1983ea6873f3cd3e121d65a8e0d11 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"
This reverts commit 47500553d99aec5ce108cd7c0b48d8e44a17aa57.
+
+It removes the patching of binary files from the output of the
+revert as the RPM will not patch binary files.
---
- doc/source/_static/basic.css | 416 +++++++++++++++++++++++++++++++++
- doc/source/_static/default.css | 230 ++++++++++++++++++
- doc/source/_static/header-line.gif | Bin 0 -> 48 bytes
- doc/source/_static/header_bg.jpg | Bin 0 -> 3738 bytes
- doc/source/_static/jquery.tweet.js | 154 ++++++++++++
- doc/source/_static/nature.css | 245 +++++++++++++++++++
- doc/source/_static/openstack_logo.png | Bin 0 -> 3670 bytes
- doc/source/_static/tweaks.css | 94 ++++++++
- doc/source/_theme/layout.html | 83 +++++++
- doc/source/_theme/theme.conf | 4 +
- doc/source/conf.py | 8 +-
- test-requirements.txt | 1 -
- 12 files changed, 1229 insertions(+), 6 deletions(-)
+ doc/source/_static/basic.css | 416 +++++++++++++++++++++++++++++++++++++
+ doc/source/_static/default.css | 230 ++++++++++++++++++++
+ doc/source/_static/jquery.tweet.js | 154 ++++++++++++++
+ doc/source/_static/nature.css | 245 ++++++++++++++++++++++
+ doc/source/_static/tweaks.css | 94 +++++++++
+ doc/source/_theme/layout.html | 83 ++++++++
+ doc/source/_theme/theme.conf | 4 +
+ doc/source/conf.py | 8 +-
+ test-requirements.txt | 1 -
+ 9 files changed, 1229 insertions(+), 6 deletions(-)
create mode 100644 doc/source/_static/basic.css
create mode 100644 doc/source/_static/default.css
- create mode 100644 doc/source/_static/header-line.gif
- create mode 100644 doc/source/_static/header_bg.jpg
create mode 100644 doc/source/_static/jquery.tweet.js
create mode 100644 doc/source/_static/nature.css
- create mode 100644 doc/source/_static/openstack_logo.png
create mode 100644 doc/source/_static/tweaks.css
create mode 100644 doc/source/_theme/layout.html
create mode 100644 doc/source/_theme/theme.conf
@@ -1327,10 +1324,10 @@ index 43e972e..d2063e2 100644
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
diff --git a/test-requirements.txt b/test-requirements.txt
-index 10df081..ff9d2b4 100644
+index 32b6f1b..c781933 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
-@@ -15,6 +15,5 @@ pylint==0.25.2
+@@ -11,6 +11,5 @@ pylint==0.25.2
python-subunit
setuptools_git>=0.4
sphinx>=1.1.2
diff --git a/openstack-nova.spec b/openstack-nova.spec
index f26ae8e..a60da3d 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,13 +2,13 @@
Name: openstack-nova
Version: 2013.2
-Release: 0.15.b2%{?dist}
+Release: 0.16.b3%{?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-2/+download/nova-%{version}.b2.tar.gz
+Source0: https://launchpad.net/nova/havana/havana-3/+download/nova-%{version}.b3.tar.gz
Source1: nova-dist.conf
Source6: nova.logrotate
@@ -35,7 +35,7 @@ Source24: nova-sudoers
Source30: openstack-nova-novncproxy.sysconfig
#
-# patches_base=2013.2.b2
+# patches_base=2013.2.b3
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
Patch0002: 0002-remove-runtime-dep-on-python-pbr.patch
@@ -386,7 +386,7 @@ This package contains documentation files for nova.
%endif
%prep
-%setup -q -n nova-%{version}.b2
+%setup -q -n nova-%{version}.b3
%patch0001 -p1
%patch0002 -p1
@@ -897,6 +897,9 @@ fi
%endif
%changelog
+* Mon Sep 09 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.16.b3
+- Update to Havana milestone 3
+
* Tue Aug 27 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.15.b2
- Fix the tarball download link (SOURCE0)
diff --git a/sources b/sources
index bbbcef9..ca19934 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f5c9755adef5c9bda1c2497dd5d87ec nova-2013.2.b2.tar.gz
+0f81fe05b5f7ff9b1618000ab859ac6b nova-2013.2.b3.tar.gz
More information about the scm-commits
mailing list