[openstack-neutron/el6-icehouse] removed 'Use parallel installed versions in RHEL6' patch and related build dependencies
Ihar Hrachyshka
ihrachyshka at fedoraproject.org
Thu Jul 10 14:53:00 UTC 2014
commit 1660aa9210143927f3771fc2ac93870c3f443ab0
Author: Ihar Hrachyshka <ihrachys at redhat.com>
Date: Thu Jul 10 16:18:10 2014 +0200
removed 'Use parallel installed versions in RHEL6' patch and related build dependencies
...ch => 0001-Remove-dnsmasq-version-warning.patch | 2 +-
...-use-parallel-installed-versions-in-RHEL6.patch | 54 --------------------
... => 0002-remove-runtime-dependency-on-pbr.patch | 2 +-
...e-and-systemd-modules-from-oslo-incubator.patch | 2 +-
...004-Removed-signing_dir-from-neutron.conf.patch | 2 +-
...Remove-kernel-version-check-for-OVS-VXLAN.patch | 2 +-
...ing-key-is-specified-in-the-address-for-a.patch | 2 +-
...007-remove-token-from-notifier-middleware.patch | 2 +-
openstack-neutron.spec | 31 ++++-------
9 files changed, 19 insertions(+), 80 deletions(-)
---
diff --git a/0002-Remove-dnsmasq-version-warning.patch b/0001-Remove-dnsmasq-version-warning.patch
similarity index 95%
rename from 0002-Remove-dnsmasq-version-warning.patch
rename to 0001-Remove-dnsmasq-version-warning.patch
index bce9180..86cca57 100644
--- a/0002-Remove-dnsmasq-version-warning.patch
+++ b/0001-Remove-dnsmasq-version-warning.patch
@@ -1,4 +1,4 @@
-From 9ca90822cdaef5ef102d953a5cc59c5ed1eb4aa6 Mon Sep 17 00:00:00 2001
+From 626e636bec5ac2e5d38dfa8af38ead7ceb12fa43 Mon Sep 17 00:00:00 2001
From: Terry Wilson <twilson at redhat.com>
Date: Fri, 13 Dec 2013 09:41:43 -0600
Subject: [PATCH] Remove dnsmasq version warning
diff --git a/0003-remove-runtime-dependency-on-pbr.patch b/0002-remove-runtime-dependency-on-pbr.patch
similarity index 92%
rename from 0003-remove-runtime-dependency-on-pbr.patch
rename to 0002-remove-runtime-dependency-on-pbr.patch
index 4ce10cd..cd166ca 100644
--- a/0003-remove-runtime-dependency-on-pbr.patch
+++ b/0002-remove-runtime-dependency-on-pbr.patch
@@ -1,4 +1,4 @@
-From 16c69ff1d86391ac97d2ed2bfc863513694655fd Mon Sep 17 00:00:00 2001
+From 48391afa9d721d15763cc60a555c8846dd7cde74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
Date: Mon, 24 Mar 2014 14:50:23 +0000
Subject: [PATCH] remove runtime dependency on pbr
diff --git a/0004-Sync-service-and-systemd-modules-from-oslo-incubator.patch b/0003-Sync-service-and-systemd-modules-from-oslo-incubator.patch
similarity index 99%
rename from 0004-Sync-service-and-systemd-modules-from-oslo-incubator.patch
rename to 0003-Sync-service-and-systemd-modules-from-oslo-incubator.patch
index 1387f91..555da50 100644
--- a/0004-Sync-service-and-systemd-modules-from-oslo-incubator.patch
+++ b/0003-Sync-service-and-systemd-modules-from-oslo-incubator.patch
@@ -1,4 +1,4 @@
-From f0bbb2c80e84848967885599d8b57f0710d7d44c Mon Sep 17 00:00:00 2001
+From 48320f598f0790ab1912d2bede8ab7be4b9925a0 Mon Sep 17 00:00:00 2001
From: Jakub Libosvar <libosvar at redhat.com>
Date: Mon, 17 Mar 2014 16:36:01 +0100
Subject: [PATCH] Sync service and systemd modules from oslo-incubator
diff --git a/0005-Removed-signing_dir-from-neutron.conf.patch b/0004-Removed-signing_dir-from-neutron.conf.patch
similarity index 92%
rename from 0005-Removed-signing_dir-from-neutron.conf.patch
rename to 0004-Removed-signing_dir-from-neutron.conf.patch
index 69104b3..017c622 100644
--- a/0005-Removed-signing_dir-from-neutron.conf.patch
+++ b/0004-Removed-signing_dir-from-neutron.conf.patch
@@ -1,4 +1,4 @@
-From 1e61f12a0ccc0e4a876bbe3e3529f96a52c2f1d7 Mon Sep 17 00:00:00 2001
+From 04796c70a2853177ede6b8cc24c31a8dbdec49df Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys at redhat.com>
Date: Mon, 28 Apr 2014 15:05:30 +0200
Subject: [PATCH] Removed signing_dir from neutron.conf
diff --git a/0006-Remove-kernel-version-check-for-OVS-VXLAN.patch b/0005-Remove-kernel-version-check-for-OVS-VXLAN.patch
similarity index 99%
rename from 0006-Remove-kernel-version-check-for-OVS-VXLAN.patch
rename to 0005-Remove-kernel-version-check-for-OVS-VXLAN.patch
index 5a91d5e..6db3ce8 100644
--- a/0006-Remove-kernel-version-check-for-OVS-VXLAN.patch
+++ b/0005-Remove-kernel-version-check-for-OVS-VXLAN.patch
@@ -1,4 +1,4 @@
-From 6338796ad354f7e82945a52ab14914e1fc490ae3 Mon Sep 17 00:00:00 2001
+From f156ae403a5e3a218bf1282232d5019b389e9e52 Mon Sep 17 00:00:00 2001
From: Miguel Angel Ajo <mangelajo at redhat.com>
Date: Mon, 26 May 2014 15:56:23 +0200
Subject: [PATCH] Remove kernel version check for OVS VXLAN
diff --git a/0007-Ensure-routing-key-is-specified-in-the-address-for-a.patch b/0006-Ensure-routing-key-is-specified-in-the-address-for-a.patch
similarity index 95%
rename from 0007-Ensure-routing-key-is-specified-in-the-address-for-a.patch
rename to 0006-Ensure-routing-key-is-specified-in-the-address-for-a.patch
index c852a86..d623def 100644
--- a/0007-Ensure-routing-key-is-specified-in-the-address-for-a.patch
+++ b/0006-Ensure-routing-key-is-specified-in-the-address-for-a.patch
@@ -1,4 +1,4 @@
-From 9155f7bf00bb50e4988b047e311a2e089e8b8ac9 Mon Sep 17 00:00:00 2001
+From c9481b1161cb29b25f676701a1895bfbc6cb4202 Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant at redhat.com>
Date: Mon, 9 Jun 2014 16:53:21 -0400
Subject: [PATCH] Ensure routing key is specified in the address for a direct
diff --git a/0008-remove-token-from-notifier-middleware.patch b/0007-remove-token-from-notifier-middleware.patch
similarity index 98%
rename from 0008-remove-token-from-notifier-middleware.patch
rename to 0007-remove-token-from-notifier-middleware.patch
index c544c13..4bbe294 100644
--- a/0008-remove-token-from-notifier-middleware.patch
+++ b/0007-remove-token-from-notifier-middleware.patch
@@ -1,4 +1,4 @@
-From 158e3da6c89defa7a3787f389529432aee8db476 Mon Sep 17 00:00:00 2001
+From f8e13581fb492b0e957f3fbc548604c4fdee37f6 Mon Sep 17 00:00:00 2001
From: Grant Murphy <gmurphy at redhat.com>
Date: Thu, 19 Jun 2014 02:30:13 +0000
Subject: [PATCH] remove token from notifier middleware
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index c3bd2ac..e5ae097 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
Name: openstack-neutron
Version: 2014.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Provides: openstack-quantum = %{version}-%{release}
Obsoletes: openstack-quantum < 2013.2-0.3.b3
@@ -47,28 +47,18 @@ Source90: neutron-dist.conf
#
# patches_base=2014.1.1+1
#
-Patch0001: 0001-use-parallel-installed-versions-in-RHEL6.patch
-Patch0002: 0002-Remove-dnsmasq-version-warning.patch
-Patch0003: 0003-remove-runtime-dependency-on-pbr.patch
-Patch0004: 0004-Sync-service-and-systemd-modules-from-oslo-incubator.patch
-Patch0005: 0005-Removed-signing_dir-from-neutron.conf.patch
-Patch0006: 0006-Remove-kernel-version-check-for-OVS-VXLAN.patch
-Patch0007: 0007-Ensure-routing-key-is-specified-in-the-address-for-a.patch
-Patch0008: 0008-remove-token-from-notifier-middleware.patch
+Patch0001: 0001-Remove-dnsmasq-version-warning.patch
+Patch0002: 0002-remove-runtime-dependency-on-pbr.patch
+Patch0003: 0003-Sync-service-and-systemd-modules-from-oslo-incubator.patch
+Patch0004: 0004-Removed-signing_dir-from-neutron.conf.patch
+Patch0005: 0005-Remove-kernel-version-check-for-OVS-VXLAN.patch
+Patch0006: 0006-Ensure-routing-key-is-specified-in-the-address-for-a.patch
+Patch0007: 0007-remove-token-from-notifier-middleware.patch
BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: python-setuptools
-# Build require these parallel versions
-# as setup.py build imports neutron.openstack.common.setup
-# which will then check for these
-BuildRequires: python-sqlalchemy0.7
-BuildRequires: python-webob1.2
-BuildRequires: python-paste-deploy1.5
-BuildRequires: python-routes1.12
-BuildRequires: python-jinja2-26
-BuildRequires: dos2unix
BuildRequires: python-pbr
BuildRequires: python-d2to1
@@ -477,7 +467,6 @@ IPSec.
%patch0005 -p1
%patch0006 -p1
%patch0007 -p1
-%patch0008 -p1
find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
@@ -1103,6 +1092,10 @@ fi
%changelog
+* Thu Jul 10 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1.1-4
+- removed 'Use parallel installed versions in RHEL6' patch and unneeded
+ build dependencies
+
* Wed Jul 02 2014 Jakub Libosvar <jlibosva at redhat.com> - 2014.1.1-3
- Disable nova notifications by default, bz#1093879
More information about the scm-commits
mailing list