contrib/rpm: merge branch 'th/contrib-rpm-fixes'

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/865

contrib/fedora/rpm/NetworkManager.spec

@@ -121,6 +121,14 @@
 %global dbus_sys_dir %{_sysconfdir}/dbus-1/system.d
 %endif
 
+# Older libndp versions use select() (rh#1933041). On well known distros,
+# choose a version that has the necessary fix.
+%if 0%{?rhel} && 0%{?rhel} == 8
+%global libndp_version 1.7-4
+%else
+%global libndp_version %{nil}
+%endif
+
 %if %{with bluetooth} || %{with wwan}
 %global with_modem_manager_1 1
 %else
@@ -197,7 +205,9 @@ Requires(postun): systemd
 Requires: dbus >= %{dbus_version}
 Requires: glib2 >= %{glib2_version}
 Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
-Obsoletes: dhcdbd
+%if "%{libndp_version}" != ""
+Requires: libndp >= %{libndp_version}
+%endif
 Obsoletes: NetworkManager < %{obsoletes_device_plugins}
 Obsoletes: NetworkManager < %{obsoletes_ppp_plugin}
 Obsoletes: NetworkManager-wimax < 1.2
@@ -246,7 +256,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
@@ -322,7 +331,6 @@ Summary: ADSL device plugin for NetworkManager
 Group: System Environment/Base
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Obsoletes: NetworkManager < %{obsoletes_device_plugins}
-Obsoletes: NetworkManager-atm
 
 %description adsl
 This package contains NetworkManager support for ADSL devices.
@@ -342,7 +350,6 @@ Requires: NetworkManager-wwan = %{epoch}:%{version}-%{release}
 Requires: bluez >= 4.101-5
 %endif
 Obsoletes: NetworkManager < %{obsoletes_device_plugins}
-Obsoletes: NetworkManager-bt
 
 %description bluetooth
 This package contains NetworkManager support for Bluetooth devices.
@@ -563,6 +570,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} \
@@ -691,6 +700,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 \