diff --git a/linux-firmware.spec b/linux-firmware.spec index 690d7c7..6fb656a 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -102,66 +102,39 @@ This package contains the firmware required by the iwlegacy driver 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 iwl100-firmware -Summary: Firmware for Intel(R) Wireless WiFi Link 100 Series Adapters -License: Redistributable, no modification permitted -Requires: linux-firmware-whence -%description -n iwl100-firmware -This package contains the firmware required by the Intel wireless drivers -for Linux to support the iwl100 hardware. Usage of the firmware -is subject to the terms and conditions contained inside the provided -LICENSE file. Please read it carefully. - -%package -n iwl105-firmware -Summary: Firmware for Intel(R) Centrino Wireless-N 105 Series Adapters -License: Redistributable, no modification permitted -Requires: linux-firmware-whence -%description -n iwl105-firmware -This package contains the firmware required by the Intel wireless drivers -for Linux to support the iwl105 hardware. Usage of the firmware -is subject to the terms and conditions contained inside the provided -LICENSE file. Please read it carefully. - -%package -n iwl135-firmware -Summary: Firmware for Intel(R) Centrino Wireless-N 135 Series Adapters -License: Redistributable, no modification permitted -Requires: linux-firmware-whence -%description -n iwl135-firmware -This package contains the firmware required by the Intel wireless drivers -for Linux to support the iwl135 hardware. Usage of the firmware -is subject to the terms and conditions contained inside the provided -LICENSE file. Please read it carefully. - -%package -n iwl1000-firmware -Summary: Firmware for Intel® PRO/Wireless 1000 B/G/N network adaptors -License: Redistributable, no modification permitted -Epoch: 1 -Requires: linux-firmware-whence -%description -n iwl1000-firmware -This package contains the firmware required by the Intel wireless drivers -for Linux to support the iwl1000 hardware. Usage of the firmware -is subject to the terms and conditions contained inside the provided -LICENSE file. Please read it carefully. - -%package -n iwl2000-firmware -Summary: Firmware for Intel(R) Centrino Wireless-N 2000 Series Adapters -License: Redistributable, no modification permitted -Requires: linux-firmware-whence -%description -n iwl2000-firmware -This package contains the firmware required by the Intel wireless drivers -for Linux to support the iwl2000 hardware. Usage of the firmware -is subject to the terms and conditions contained inside the provided -LICENSE file. Please read it carefully. - -%package -n iwl2030-firmware -Summary: Firmware for Intel(R) Centrino Wireless-N 2030 Series Adapters -License: Redistributable, no modification permitted -Requires: linux-firmware-whence -%description -n iwl2030-firmware -This package contains the firmware required by the Intel wireless drivers -for Linux to support the iwl2030 hardware. Usage of the firmware -is subject to the terms and conditions contained inside the provided -LICENSE file. Please read it carefully. +%package -n iwlwifi-dvm-firmware +Summary: DVM Firmware for Intel(R) Wireless WiFi adapters +License: Redistributable, no modification permitted +Requires: linux-firmware-whence +Obsoletes: iwl100-firmware < %{version}-%{release} +Obsoletes: iwl105-firmware < %{version}-%{release} +Obsoletes: iwl135-firmware < %{version}-%{release} +Obsoletes: iwl1000-firmware < 1:%{version}-%{release} +Obsoletes: iwl2000-firmware < %{version}-%{release} +Obsoletes: iwl2030-firmware < %{version}-%{release} +Obsoletes: iwl5000-firmware < %{version}-%{release} +Obsoletes: iwl5150-firmware < %{version}-%{release} +Obsoletes: iwl6000-firmware < %{version}-%{release} +Obsoletes: iwl6000g2a-firmware < %{version}-%{release} +Obsoletes: iwl6000g2b-firmware < %{version}-%{release} +Obsoletes: iwl6050-firmware < %{version}-%{release} +Provides: iwl100-firmware = %{version}-%{release} +Provides: iwl105-firmware = %{version}-%{release} +Provides: iwl135-firmware = %{version}-%{release} +Provides: iwl1000-firmware = 1:%{version}-%{release} +Provides: iwl2000-firmware = %{version}-%{release} +Provides: iwl2030-firmware = %{version}-%{release} +Provides: iwl5000-firmware = %{version}-%{release} +Provides: iwl5150-firmware = %{version}-%{release} +Provides: iwl6000-firmware = %{version}-%{release} +Provides: iwl6000g2a-firmware = %{version}-%{release} +Provides: iwl6000g2b-firmware = %{version}-%{release} +Provides: iwl6050-firmware = %{version}-%{release} +%description -n iwlwifi-dvm-firmware +This package contains the firmware required by the iwlwifi driver +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 @@ -173,60 +146,6 @@ 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 iwl5000-firmware -Summary: Firmware for Intel® PRO/Wireless 5000 A/G/N network adaptors -License: Redistributable, no modification permitted -Requires: linux-firmware-whence -%description -n iwl5000-firmware -This package contains the firmware required by the iwl5000 driver -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 iwl5150-firmware -Summary: Firmware for Intel® PRO/Wireless 5150 A/G/N network adaptors -License: Redistributable, no modification permitted -Requires: linux-firmware-whence -%description -n iwl5150-firmware -This package contains the firmware required by the iwl5150 driver -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 iwl6000-firmware -Summary: Firmware for Intel(R) Wireless WiFi Link 6000 AGN Adapter -License: Redistributable, no modification permitted -Requires: linux-firmware-whence -%description -n iwl6000-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 iwl6000g2a-firmware -Summary: Firmware for Intel(R) Wireless WiFi Link 6005 Series Adapters -License: Redistributable, no modification permitted -Requires: linux-firmware-whence -%description -n iwl6000g2a-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 iwl6000g2b-firmware -Summary: Firmware for Intel(R) Wireless WiFi Link 6030 Series Adapters -License: Redistributable, no modification permitted -Requires: linux-firmware-whence -%description -n iwl6000g2b-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 iwl6050-firmware -Summary: Firmware for Intel(R) Wireless WiFi Link 6050 Series Adapters -License: Redistributable, no modification permitted -Requires: linux-firmware-whence -%description -n iwl6050-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 @@ -485,58 +404,25 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %{_firmwarepath}/iwlwifi-3945-*.ucode* %{_firmwarepath}/iwlwifi-4965-*.ucode* -%files -n iwl100-firmware -%license LICENCE.iwlwifi_firmware -%{_firmwarepath}/iwlwifi-100-5.ucode* - -%files -n iwl105-firmware +%files -n iwlwifi-dvm-firmware %license LICENCE.iwlwifi_firmware +%{_firmwarepath}/iwlwifi-100-*.ucode* %{_firmwarepath}/iwlwifi-105-*.ucode* - -%files -n iwl135-firmware -%license LICENCE.iwlwifi_firmware %{_firmwarepath}/iwlwifi-135-*.ucode* - -%files -n iwl1000-firmware -%license LICENCE.iwlwifi_firmware %{_firmwarepath}/iwlwifi-1000-*.ucode* - -%files -n iwl2000-firmware -%license LICENCE.iwlwifi_firmware %{_firmwarepath}/iwlwifi-2000-*.ucode* - -%files -n iwl2030-firmware -%license LICENCE.iwlwifi_firmware %{_firmwarepath}/iwlwifi-2030-*.ucode* - -%files -n iwl3160-firmware -%license LICENCE.iwlwifi_firmware -%{_firmwarepath}/iwlwifi-3160-*.ucode* -%{_firmwarepath}/iwlwifi-3168-*.ucode* - -%files -n iwl5000-firmware -%license LICENCE.iwlwifi_firmware %{_firmwarepath}/iwlwifi-5000-*.ucode* - -%files -n iwl5150-firmware -%license LICENCE.iwlwifi_firmware %{_firmwarepath}/iwlwifi-5150-*.ucode* - -%files -n iwl6000-firmware -%license LICENCE.iwlwifi_firmware %{_firmwarepath}/iwlwifi-6000-*.ucode* - -%files -n iwl6000g2a-firmware -%license LICENCE.iwlwifi_firmware %{_firmwarepath}/iwlwifi-6000g2a-*.ucode* - -%files -n iwl6000g2b-firmware -%license LICENCE.iwlwifi_firmware %{_firmwarepath}/iwlwifi-6000g2b-*.ucode* +%{_firmwarepath}/iwlwifi-6050-*.ucode* -%files -n iwl6050-firmware +%files -n iwl3160-firmware %license LICENCE.iwlwifi_firmware -%{_firmwarepath}/iwlwifi-6050-*.ucode* +%{_firmwarepath}/iwlwifi-3160-*.ucode* +%{_firmwarepath}/iwlwifi-3168-*.ucode* %files -n iwl7260-firmware %license LICENCE.iwlwifi_firmware @@ -632,6 +518,7 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %changelog * 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. * Tue May 16 2023 Peter Robinson - 20230515-150 - Update to upstream 20230515 release