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.
This commit is contained in:
Thomas Haller 2021-05-21 08:49:00 +02:00
parent 199807b2ec
commit f215c9a7fa
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728

View file

@ -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 \