[openstack-nova/el6-icehouse] Drop parallel installables and update sources file
Nikola Dipanov
ndipanov at fedoraproject.org
Mon May 19 13:11:15 UTC 2014
commit e2a3f2ca373a0357e0b081694ba3899587bd31c5
Author: Nikola Dipanov <ndipanov at redhat.com>
Date: Mon May 19 13:11:18 2014 +0200
Drop parallel installables and update sources file
.gitignore | 1 +
...e-don-t-access-the-net-when-building-docs.patch | 2 +-
0002-remove-runtime-dep-on-python-pbr.patch | 2 +-
...evert-Replace-oslo.sphinx-with-oslosphinx.patch | 2 +-
...-parallel-install-versions-of-epel-packag.patch | 51 --------------------
...ify-calling-process-we-are-ready-to-serve.patch | 2 +-
...Move-notification-point-to-a-better-place.patch | 2 +-
openstack-nova.spec | 40 ++++++++-------
sources | 2 +-
9 files changed, 28 insertions(+), 76 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 11a945d..8f6e545 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
/nova-2014.1.b2.tar.gz
/nova-2014.1.b3.tar.gz
/nova-2014.1.rc1.tar.gz
+/nova-2014.1.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 ab19aa6..b378e8d 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 f20d1cdc0b6ab1125c9d24bc614e9714b0893881 Mon Sep 17 00:00:00 2001
+From a71d412aa87f618ed885bf43e9c2529ab822bd85 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 ef91f44..876eade 100644
--- a/0002-remove-runtime-dep-on-python-pbr.patch
+++ b/0002-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From c94e68cfb6e2fd8c3a0f90c788221666bec4e03e Mon Sep 17 00:00:00 2001
+From 6001d01607afae71eb596f7066e8167d4c45f1a3 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/0004-Revert-Replace-oslo.sphinx-with-oslosphinx.patch b/0003-Revert-Replace-oslo.sphinx-with-oslosphinx.patch
similarity index 96%
rename from 0004-Revert-Replace-oslo.sphinx-with-oslosphinx.patch
rename to 0003-Revert-Replace-oslo.sphinx-with-oslosphinx.patch
index f5dd1c5..0f376a1 100644
--- a/0004-Revert-Replace-oslo.sphinx-with-oslosphinx.patch
+++ b/0003-Revert-Replace-oslo.sphinx-with-oslosphinx.patch
@@ -1,4 +1,4 @@
-From 09bf54da834b24dbd97113bae6c4845f80ec6832 Mon Sep 17 00:00:00 2001
+From 8134a2e58a95776cea7db1f0aa94a255a61bfe6f Mon Sep 17 00:00:00 2001
From: Vladan Popovic <vpopovic at redhat.com>
Date: Fri, 7 Mar 2014 17:00:47 +0100
Subject: [PATCH] Revert "Replace oslo.sphinx with oslosphinx"
diff --git a/0005-notify-calling-process-we-are-ready-to-serve.patch b/0004-notify-calling-process-we-are-ready-to-serve.patch
similarity index 98%
rename from 0005-notify-calling-process-we-are-ready-to-serve.patch
rename to 0004-notify-calling-process-we-are-ready-to-serve.patch
index 1d7cf0e..06b165b 100644
--- a/0005-notify-calling-process-we-are-ready-to-serve.patch
+++ b/0004-notify-calling-process-we-are-ready-to-serve.patch
@@ -1,4 +1,4 @@
-From 5fd10951d0be24d9767102725079488148ffa00a Mon Sep 17 00:00:00 2001
+From 183eb4752ec0bce74cd5cefaabec25cc3d20c7f0 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Tue, 11 Feb 2014 22:36:00 +0100
Subject: [PATCH] notify calling process we are ready to serve
diff --git a/0006-Move-notification-point-to-a-better-place.patch b/0005-Move-notification-point-to-a-better-place.patch
similarity index 96%
rename from 0006-Move-notification-point-to-a-better-place.patch
rename to 0005-Move-notification-point-to-a-better-place.patch
index ed8469b..f855a8c 100644
--- a/0006-Move-notification-point-to-a-better-place.patch
+++ b/0005-Move-notification-point-to-a-better-place.patch
@@ -1,4 +1,4 @@
-From 2d6c366dc6564dec037dcb4de3d1ec6e29954259 Mon Sep 17 00:00:00 2001
+From 364f8e07b46d8e69595e19ed87ca3042c88373c9 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Mon, 14 Apr 2014 18:11:04 +0200
Subject: [PATCH] Move notification point to a better place
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 10f5614..bb6c1f4 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
Name: openstack-nova
Version: 2014.1
-Release: 2%{?dist}
+Release: 0.15%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
@@ -55,16 +55,15 @@ Source30: openstack-nova-novncproxy.sysconfig
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
Patch0002: 0002-remove-runtime-dep-on-python-pbr.patch
-Patch0003: 0003-Use-updated-parallel-install-versions-of-epel-packag.patch
-Patch0004: 0004-Revert-Replace-oslo.sphinx-with-oslosphinx.patch
-Patch0005: 0005-notify-calling-process-we-are-ready-to-serve.patch
-Patch0006: 0006-Move-notification-point-to-a-better-place.patch
+Patch0003: 0003-Revert-Replace-oslo.sphinx-with-oslosphinx.patch
+Patch0004: 0004-notify-calling-process-we-are-ready-to-serve.patch
+Patch0005: 0005-Move-notification-point-to-a-better-place.patch
# This is EPEL specific and not upstream
BuildArch: noarch
BuildRequires: intltool
-BuildRequires: python-sphinx10
+BuildRequires: python-sphinx >= 1.1.2
BuildRequires: python-oslo-sphinx
BuildRequires: python-setuptools
BuildRequires: python-netaddr
@@ -73,11 +72,11 @@ BuildRequires: python-pbr
BuildRequires: python-d2to1
BuildRequires: python-six
# These are required to build due to the requirements check added
-BuildRequires: python-paste-deploy1.5
-BuildRequires: python-routes1.12
-BuildRequires: python-sqlalchemy0.7
-BuildRequires: python-webob1.2
-BuildRequires: python-jinja2-26
+BuildRequires: python-paste-deploy >= 1.5.0
+BuildRequires: python-routes >= 1.12
+BuildRequires: python-sqlalchemy >= 0.7.8
+BuildRequires: python-webob >= 1.2.3
+BuildRequires: python-jinja2 >= 2.6
Requires: openstack-nova-compute = %{version}-%{release}
Requires: openstack-nova-cert = %{version}-%{release}
@@ -384,12 +383,12 @@ Requires: python-stevedore
Requires: python-memcached
-Requires: python-sqlalchemy0.7
+Requires: python-sqlalchemy >= 0.7.8
Requires: python-migrate
-Requires: python-paste-deploy1.5
-Requires: python-routes1.12
-Requires: python-webob1.2
+Requires: python-paste-deploy >= 1.5
+Requires: python-routes >= 1.12
+Requires: python-webob >= 1.2.3
Requires: python-glanceclient >= 1:0
Requires: python-neutronclient
@@ -398,7 +397,7 @@ Requires: python-oslo-config >= 1:1.2.0
Requires: python-pyasn1
Requires: python-six >= 1.4.1
Requires: python-babel
-Requires: python-jinja2-26
+Requires: python-jinja2i >= 2.6
%description -n python-nova
OpenStack Compute (codename Nova) is open source software designed to
@@ -436,7 +435,6 @@ This package contains documentation files for nova.
%patch0003 -p1
%patch0004 -p1
%patch0005 -p1
-%patch0006 -p1
# Apply EPEL patch
@@ -486,7 +484,7 @@ export PYTHONPATH="$( pwd ):$PYTHONPATH"
pushd doc
%if 0%{?with_doc}
-SPHINX_DEBUG=1 sphinx-1.0-build -b html source build/html
+SPHINX_DEBUG=1 sphinx-build -b html source build/html
# Fix hidden-file-or-dir warnings
rm -fr build/html/.doctrees build/html/.buildinfo
%endif
@@ -494,7 +492,7 @@ rm -fr build/html/.doctrees build/html/.buildinfo
# Create dir link to avoid a sphinx-build exception
mkdir -p build/man/.doctrees/
ln -s . build/man/.doctrees/man
-SPHINX_DEBUG=1 sphinx-1.0-build -b man -c source source/man build/man
+SPHINX_DEBUG=1 sphinx-build -b man -c source source/man build/man
mkdir -p %{buildroot}%{_mandir}/man1
install -p -D -m 644 build/man/*.1 %{buildroot}%{_mandir}/man1/
@@ -902,6 +900,10 @@ fi
%endif
%changelog
+* Mon May 19 2014 Nikola Đipanov <ndipanov at redhat.com> 2014.1-0.15
+- Drop parallel python packages in RDO el6
+- Update the sources file with the latest tarball
+
* Thu Apr 17 2014 Vladan Popovic <vpopovic at redhat.com> 2014.1-0.14
- Update to upstream 2014.1
diff --git a/sources b/sources
index d9940b2..290ef18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4fdb88bb0024cd02474848cff1d890a2 nova-2014.1.rc1.tar.gz
+b32fc758e851efe1815355930fcb815f nova-2014.1.tar.gz
More information about the scm-commits
mailing list