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:
@@ -257,7 +257,6 @@ BuildRequires: gtk-doc
|
|||||||
BuildRequires: libudev-devel
|
BuildRequires: libudev-devel
|
||||||
BuildRequires: libuuid-devel
|
BuildRequires: libuuid-devel
|
||||||
BuildRequires: /usr/bin/valac
|
BuildRequires: /usr/bin/valac
|
||||||
BuildRequires: iptables
|
|
||||||
BuildRequires: libxslt
|
BuildRequires: libxslt
|
||||||
%if %{with bluetooth}
|
%if %{with bluetooth}
|
||||||
BuildRequires: bluez-libs-devel
|
BuildRequires: bluez-libs-devel
|
||||||
@@ -574,6 +573,8 @@ This tool is still experimental.
|
|||||||
%if %{with test}
|
%if %{with test}
|
||||||
--werror \
|
--werror \
|
||||||
%endif
|
%endif
|
||||||
|
-Dnft=/usr/sbin/nft \
|
||||||
|
-Diptables=/usr/sbin/iptables \
|
||||||
-Ddhcpcanon=no \
|
-Ddhcpcanon=no \
|
||||||
-Ddhcpcd=no \
|
-Ddhcpcd=no \
|
||||||
-Dconfig_dhcp_default=%{dhcp_default} \
|
-Dconfig_dhcp_default=%{dhcp_default} \
|
||||||
@@ -702,6 +703,8 @@ intltoolize --automake --copy --force
|
|||||||
--with-runstatedir=%{_rundir} \
|
--with-runstatedir=%{_rundir} \
|
||||||
--disable-silent-rules \
|
--disable-silent-rules \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
|
--with-nft=/usr/sbin/nft \
|
||||||
|
--with-iptables=/usr/sbin/iptables \
|
||||||
--with-dhclient=yes \
|
--with-dhclient=yes \
|
||||||
--with-dhcpcd=no \
|
--with-dhcpcd=no \
|
||||||
--with-dhcpcanon=no \
|
--with-dhcpcanon=no \
|
||||||
|
Reference in New Issue
Block a user