From 199807b2ec78c14a9741d517aea42d1dfdf17e31 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 21 May 2021 08:40:17 +0200 Subject: [PATCH] contrib/rpm: add rhel-8 specific libndp dependeny --- contrib/fedora/rpm/NetworkManager.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index ba4a14e9a8..698d89ed79 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/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,6 +205,9 @@ Requires(postun): systemd Requires: dbus >= %{dbus_version} Requires: glib2 >= %{glib2_version} Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release} +%if "%{libndp_version}" != "" +Requires: libndp >= %{libndp_version} +%endif Obsoletes: dhcdbd Obsoletes: NetworkManager < %{obsoletes_device_plugins} Obsoletes: NetworkManager < %{obsoletes_ppp_plugin}