diff --git a/linux-firmware.spec b/linux-firmware.spec index 6fb656a..f34c137 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -136,36 +136,21 @@ for Linux built with DVM firmware support (CONFIG_IWLDVM=y/m). Usage of the firmware is subject to the terms and conditions contained inside the provided LICENSE file. Please read it carefully. -%package -n iwl3160-firmware -Summary: Firmware for Intel(R) Wireless WiFi Link 3160 Series Adapters +%package -n iwlwifi-mvm-firmware +Summary: MVM Firmware for Intel(R) Wireless WiFi adapters License: Redistributable, no modification permitted -Epoch: 1 Requires: linux-firmware-whence -%description -n iwl3160-firmware -This package contains the firmware required by the Intel wireless drivers -for Linux. Usage of the firmware is subject to the terms and conditions -contained inside the provided LICENSE file. Please read it carefully. - -%package -n iwl7260-firmware -Summary: Firmware for Intel(R) Wireless WiFi Link 726x/8000/9000 Series Adapters -License: Redistributable, no modification permitted -Epoch: 1 -Requires: linux-firmware-whence -Recommends: iwlax2xx-firmware -%description -n iwl7260-firmware -This package contains the firmware required by the Intel wireless drivers -for Linux. Usage of the firmware is subject to the terms and conditions -contained inside the provided LICENSE file. Please read it carefully. - -%package -n iwlax2xx-firmware -Summary: Firmware for Intel(R) Wireless WiFi Link AX2xx Series Adapters -License: Redistributable, no modification permitted -Requires: linux-firmware-whence -Recommends: iwl7260-firmware -%description -n iwlax2xx-firmware -This package contains the firmware required by the Intel wireless drivers -for Linux. Usage of the firmware is subject to the terms and conditions -contained inside the provided LICENSE file. Please read it carefully. +Obsoletes: iwl3160-firmware < 1:%{version}-%{release} +Obsoletes: iwl7260-firmware < 1:%{version}-%{release} +Obsoletes: iwlax2xx-firmware < %{version}-%{release} +Provides: iwl3160-firmware = 1:%{version}-%{release} +Provides: iwl7260-firmware = 1:%{version}-%{release} +Provides: iwlax2xx-firmware = %{version}-%{release} +%description -n iwlwifi-mvm-firmware +This package contains the firmware required by the iwlwifi driver +for Linux built with MVM firmware support (CONFIG_IWLMVM=y/m). Usage of +the firmware is subject to the terms and conditions contained inside the +provided LICENSE file. Please read it carefully. %package -n libertas-sd8686-firmware Summary: Firmware for Marvell Libertas SD 8686 Network Adapter @@ -419,13 +404,10 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %{_firmwarepath}/iwlwifi-6000g2b-*.ucode* %{_firmwarepath}/iwlwifi-6050-*.ucode* -%files -n iwl3160-firmware +%files -n iwlwifi-mvm-firmware %license LICENCE.iwlwifi_firmware %{_firmwarepath}/iwlwifi-3160-*.ucode* %{_firmwarepath}/iwlwifi-3168-*.ucode* - -%files -n iwl7260-firmware -%license LICENCE.iwlwifi_firmware %{_firmwarepath}/iwlwifi-7260-*.ucode* %{_firmwarepath}/iwlwifi-7265-*.ucode* %{_firmwarepath}/iwlwifi-7265D-*.ucode* @@ -433,9 +415,6 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %{_firmwarepath}/iwlwifi-8265-*.ucode* %{_firmwarepath}/iwlwifi-9000-*.ucode* %{_firmwarepath}/iwlwifi-9260-*.ucode* - -%files -n iwlax2xx-firmware -%license LICENCE.iwlwifi_firmware %{_firmwarepath}/iwlwifi-cc-a0-*.ucode* %{_firmwarepath}/iwlwifi-Qu*.ucode* %{_firmwarepath}/iwlwifi-ty-a0* @@ -519,6 +498,7 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files * Fri May 26 2023 Herton R. Krzesinski - 20230515-151 - Join iwl3945-firmware and iwl4965-firmware into iwlegacy-firmware package. - Create iwlwifi-dvm-firmware subpackage and fold some subpackages into it. +- Create iwlwifi-mvm-firmware subpackage and fold some subpackages into it. * Tue May 16 2023 Peter Robinson - 20230515-150 - Update to upstream 20230515 release