Bring back the boolean dep for the wireless daemon

Hopefully this will allow installing iwd while still preferring
wpa_supplicant.

Suggested-by: Rex Dieter <rdieter@gmail.com>
Suggested-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>>
This commit is contained in:
Lubomir Rintel 2019-09-06 14:23:45 +02:00
parent 48c1f98497
commit 5ef97724b1

View File

@ -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 <lkundrak@v3.sk> - 1:1.20.2-2
- Bring back the boolean dep for the wireless daemon
* Thu Sep 05 2019 Lubomir Rintel <lkundrak@v3.sk> - 1:1.20.2-1
- Update to 1.20.2 release
- Bring back the hard wpa_supplicant dependency (rh #1743585)