From 691d5273f1a8a055eb8904ee4a7e54f16ca86bee Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 22 Oct 2018 16:34:49 +0200 Subject: [PATCH] contrib/rpm: don't depend NetworkManager-ovs package on openvswitch on RHEL On RHEL, openvswitch package is not in the base set of packages. Hence, we cannot depend NetworkManager-ovs package on openvswitch. This isn't really a problem, because NetworkManager's OVS plugin must anyway behave graceful when openvswich service is not running or not available. It only means, that a user who wants to use the OVS plugin needs to explicitly install the openvswitch package. https://bugzilla.redhat.com/show_bug.cgi?id=1629178 https://bugzilla.redhat.com/show_bug.cgi?id=1633190 (cherry picked from commit 669bd330229e9d73bb3f0d82ddb164c0437233b4) (cherry picked from commit f92d2d7766e7fbe26bf5bc9286ab2cc516143cfc) --- contrib/fedora/rpm/NetworkManager.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index d5188fa1b1..b34b383114 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -298,7 +298,9 @@ devices. Summary: Open vSwitch device plugin for NetworkManager Group: System Environment/Base Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +%if 0%{?rhel} == 0 Requires: openvswitch +%endif %description ovs This package contains NetworkManager support for Open vSwitch bridges.