From 5ef97724b1787461714ad3cae9be1c8e8b207a9b Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 6 Sep 2019 14:23:45 +0200 Subject: [PATCH] Bring back the boolean dep for the wireless daemon Hopefully this will allow installing iwd while still preferring wpa_supplicant. Suggested-by: Rex Dieter Suggested-by: Igor Gnatenko > --- NetworkManager.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index 060491f..b0f2688 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -9,7 +9,7 @@ %global epoch_version 1 %global rpm_version 1.20.2 %global real_version 1.20.2 -%global release_version 1 +%global release_version 2 %global snapshot %{nil} %global git_sha %{nil} @@ -313,7 +313,16 @@ This package contains NetworkManager support for team devices. Summary: Wifi plugin for NetworkManager Group: System Environment/Base Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: wpa_supplicant >= %{wpa_supplicant_version} + +%if %{with iwd} && (0%{?fedora} > 24 || 0%{?rhel} > 7) +Requires: (wpa_supplicant >= %{wpa_supplicant_version} or iwd) +%else +# Just require wpa_supplicant on platforms that don't support boolean +# dependencies even though the plugin supports both supplicant and +# iwd backend. +Requires: (wpa_supplicant >= %{wpa_supplicant_version} or iwd) +Suggests: wpa_supplicant +%endif Obsoletes: NetworkManager < %{obsoletes_device_plugins} @@ -968,6 +977,9 @@ fi %changelog +* Fri Sep 06 2019 Lubomir Rintel - 1:1.20.2-2 +- Bring back the boolean dep for the wireless daemon + * Thu Sep 05 2019 Lubomir Rintel - 1:1.20.2-1 - Update to 1.20.2 release - Bring back the hard wpa_supplicant dependency (rh #1743585)