From f215c9a7fa0042ae3a9d3fc7a7779c566acd18f3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 21 May 2021 08:49:00 +0200 Subject: [PATCH] contrib/rpm: don't have build dependency for iptables We really only require "iptables" as build dependency to autodetect the path where iptables is installed. On Fedora/RHEL, this is always /usr/sbin, so we can just as well hard code this. Alternatively, if the autodetection is really necessary, we would also require a build dependency on /usr/sbin/nft. That seems a waste. --- contrib/fedora/rpm/NetworkManager.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 698d89ed79..0e7e5e5efd 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -257,7 +257,6 @@ BuildRequires: gtk-doc BuildRequires: libudev-devel BuildRequires: libuuid-devel BuildRequires: /usr/bin/valac -BuildRequires: iptables BuildRequires: libxslt %if %{with bluetooth} BuildRequires: bluez-libs-devel @@ -574,6 +573,8 @@ This tool is still experimental. %if %{with test} --werror \ %endif + -Dnft=/usr/sbin/nft \ + -Diptables=/usr/sbin/iptables \ -Ddhcpcanon=no \ -Ddhcpcd=no \ -Dconfig_dhcp_default=%{dhcp_default} \ @@ -702,6 +703,8 @@ intltoolize --automake --copy --force --with-runstatedir=%{_rundir} \ --disable-silent-rules \ --disable-static \ + --with-nft=/usr/sbin/nft \ + --with-iptables=/usr/sbin/iptables \ --with-dhclient=yes \ --with-dhcpcd=no \ --with-dhcpcanon=no \