From efe815737b21d27b0d98bacb50b7c4f3af2cc280 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Thu, 2 Nov 2017 11:43:59 +0100 Subject: [PATCH] contrib/rpm: fix builds without ovs support Don't compile ovs support when the RPM is built --without=ovs, to fix the following error: error: Installed (but unpackaged) file(s) found: /usr/lib/systemd/system/NetworkManager.service.d/NetworkManager-ovs.conf /usr/lib64/NetworkManager/libnm-device-plugin-ovs.so /usr/share/man/man7/nm-openvswitch.7.gz Fixes: 830a5a14cb29ca00b73a9623c1ea7c5cd92f4d00 --- contrib/fedora/rpm/NetworkManager.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 4778f15042..e0a0849933 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -437,6 +437,11 @@ intltoolize --automake --copy --force --enable-teamdctl=yes \ %else --enable-teamdctl=no \ +%endif +%if %{with ovs} + --enable-ovs=yes \ +%else + --enable-ovs=no \ %endif --with-selinux=yes \ --enable-polkit=yes \