Cross Recommends iwl7260-firmware <-> iwlax2xx-firmware

This commit is contained in:
Peter Robinson 2021-10-06 12:48:51 +01:00
parent 1dff9a8056
commit 8464455e1f

View File

@ -1,5 +1,5 @@
%global debug_package %{nil} %global debug_package %{nil}
%global firmware_release 124 %global firmware_release 125
%global _firmwarepath /usr/lib/firmware %global _firmwarepath /usr/lib/firmware
%define _binaries_in_noarch_packages_terminate_build 0 %define _binaries_in_noarch_packages_terminate_build 0
@ -211,6 +211,7 @@ Epoch: 1
Version: 25.30.13.0 Version: 25.30.13.0
Release: %{firmware_release}%{?dist} Release: %{firmware_release}%{?dist}
Requires: linux-firmware-whence Requires: linux-firmware-whence
Recommends: iwlax2xx-firmware
%description -n iwl7260-firmware %description -n iwl7260-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
for Linux. Usage of the firmware is subject to the terms and conditions for Linux. Usage of the firmware is subject to the terms and conditions
@ -220,7 +221,7 @@ contained inside the provided LICENSE file. Please read it carefully.
Summary: Firmware for Intel(R) Wireless WiFi Link AX2xx Series Adapters Summary: Firmware for Intel(R) Wireless WiFi Link AX2xx Series Adapters
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
Requires: linux-firmware-whence Requires: linux-firmware-whence
Obsoletes: iwl7260-firmware <= 1:25.30.13.0-123 Recommends: iwl7260-firmware
%description -n iwlax2xx-firmware %description -n iwlax2xx-firmware
This package contains the firmware required by the Intel wireless drivers This package contains the firmware required by the Intel wireless drivers
for Linux. Usage of the firmware is subject to the terms and conditions for Linux. Usage of the firmware is subject to the terms and conditions
@ -451,6 +452,9 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
%{_firmwarepath}/netronome/* %{_firmwarepath}/netronome/*
%changelog %changelog
* Wed Oct 6 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 20210919-125
- Cross Recommends iwl7260-firmware <-> iwlax2xx-firmware
* Mon Oct 4 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 20210919-124 * Mon Oct 4 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 20210919-124
- Attempt another pass at installing new AX2xx if iwl7260 is installed - Attempt another pass at installing new AX2xx if iwl7260 is installed