summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2017-11-02 11:43:59 +0100
committerBeniamino Galvani <bgalvani@redhat.com>2017-11-02 11:54:18 +0100
commitefe815737b21d27b0d98bacb50b7c4f3af2cc280 (patch)
treeaaa8b4e5a49f22eda03390b9a2ad4d311d7f5a78 /contrib
parenteed8ea458ba339212d1ceead3b3b67e4e9d67ad4 (diff)
downloadNetworkManager-efe815737b21d27b0d98bacb50b7c4f3af2cc280.tar.gz
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
Diffstat (limited to 'contrib')
-rw-r--r--contrib/fedora/rpm/NetworkManager.spec5
1 files changed, 5 insertions, 0 deletions
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
@@ -438,6 +438,11 @@ intltoolize --automake --copy --force
%else
--enable-teamdctl=no \
%endif
+%if %{with ovs}
+ --enable-ovs=yes \
+%else
+ --enable-ovs=no \
+%endif
--with-selinux=yes \
--enable-polkit=yes \
--enable-polkit-agent \