- ethernet and wireless moved out from main package to subpackages

diff --git a/linux-firmware.spec b/linux-firmware.spec
index 6567a45a95ded96fcc2a0f84aae31f604083cc66..84fdd01338f271ba3b65192f171a59551e83e4fa 100644 (file)
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -59,12 +59,12 @@ Provides:   radeon-ucode
 Firmware for AMD/ATI graphics chips
 
 %package -n atheros-firmware
-Summary:       Firmware for Atheros wireless and Bluetooth cards
+Summary:       Firmware for Atheros wireless and Bluetooth adapters
 License:       Redistributable, no modification permitted
 Group:         Base/Kernel
 
 %description -n atheros-firmware
-Firmware for Atheros wireless and Bluetooth cards
+Firmware for Atheros wireless and Bluetooth adapteres
 
 %package -n av-firmware
 Summary:       Firmware for various audio/video devices
@@ -91,12 +91,12 @@ Group:              Base/Kernel
 Firmware for Broadcom NetXtreme II 10Gb
 
 %package -n brcm-firmware
-Summary:       Firmware for Broadcom 802.11 wireless cards
+Summary:       Firmware for Broadcom 802.11 wireless adapters
 License:       Redistributable, no modification permitted
 Group:         Base/Kernel
 
 %description -n brcm-firmware
-Firmware for Broadcom 802.11 wireless cards
+Firmware for Broadcom 802.11 wireless adapters
 
 %package -n cavium-firmware
 Summary:       Firmware for Cavium crypto and Ethernet adapters
@@ -114,6 +114,14 @@ Group:             Base/Kernel
 %description -n chelsio-firmware
 Firmware for Chelsio T3/T4/T5/T6
 
+%package -n ethernet-firmware
+Summary:       Firmware for various ethernet adapters
+License:       Redistributable, no modification permitted
+Group:         Base/Kernel
+
+%description -n ethernet-firmware
+Firmware for various ethernet adapters
+
 %package -n intel-bluetooth-firmware
 Summary:       Firmware for Intel Bluetooth adapters
 License:       Redistributable, no modification permitted
@@ -131,12 +139,12 @@ Group:            Base/Kernel
 Firmware for Intel i915 graphics chips
 
 %package -n intel-sound-firmware
-Summary:       Firmware for Intel sound cards
+Summary:       Firmware for Intel sound adapters
 License:       Redistributable, no modification permitted
 Group:         Base/Kernel
 
 %description -n intel-sound-firmware
-Firmware for Intel sound cards
+Firmware for Intel sound adapters
 
 %package -n intel-vsc-firmware
 Summary:       Firmware for Intel Visual Sensing Controller (IVSC)
@@ -374,20 +382,20 @@ conditions contained inside the provided LICENSE file. Please read it
 carefully.
 
 %package -n marvell-firmware
-Summary:       Firmware for Marvell wirelsess network cards
+Summary:       Firmware for Marvell wirelsess network adapters
 License:       Redistributable, no modification permitted
 Group:         Base/Kernel
 
 %description -n marvell-firmware
-Firmware for Marvell wireless network cards
+Firmware for Marvell wireless network adapters
 
 %package -n mediatek-firmware
-Summary:       Firmware for MediaTek devices
+Summary:       Firmware for MediaTek wireless and Bluetooth adapters
 License:       Redistributable, no modification permitted
 Group:         Base/Kernel
 
 %description -n mediatek-firmware
-Firmware for MediaTek devices.
+Firmware for MediaTek wireless and Bluetooth adapters
 
 %package -n mellanox-firmware
 Summary:       Firmware for Mellanox Spectrum switches
@@ -447,12 +455,12 @@ This package contains the binary firmware for QLogic Infiniband,
 SCSI, Fibre Channel/FCoE adapters and Converged Network Adapters
 
 %package -n realtek-firmware
-Summary:       Firmware for Realtek WiFi/Bluetooth adapters
+Summary:       Firmware for Realtek wireless and Bluetooth adapters
 License:       Redistributable, no modification permitted
 Group:         Base/Kernel
 
 %description -n realtek-firmware
-Firmware for Realtek WiFi/Bluetooth adapters
+Firmware for Realtek wireless and Bluetooth adapters
 
 %package -n ti-firmware
 Summary:       Firmware for Texas Instruments devices
@@ -470,6 +478,14 @@ Group:             Base/Kernel
 %description -n ueagle-atm-firmware
 Firmware for USB ADSL Modems based on Eagle chipsets
 
+%package -n wireless-firmware
+Summary:       Firmware for various wireless adapters
+License:       Redistributable, no modification permitted
+Group:         Base/Kernel
+
+%description -n wireless-firmware
+Firmware for various wireless adapters
+
 %define        no_install_post_strip   1
 
 %prep
@@ -482,6 +498,7 @@ Firmware for USB ADSL Modems based on Eagle chipsets
 
 %{__mv} amd-ucode/README README.amd-ucode
 %{__mv} rtw88/README README.rtw88
+%{__mv} wfx/LICENCE.wf200 LICENCE.wf200
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -494,22 +511,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.* LICENSE.* README.md
-/lib/firmware/3com
-/lib/firmware/acenic
-/lib/firmware/adaptec
 /lib/firmware/advansys
-/lib/firmware/agere_*_fw.bin
-/lib/firmware/airoha
 /lib/firmware/amd
 /lib/firmware/amdtee
 /lib/firmware/amlogic
 /lib/firmware/arm
-/lib/firmware/atmel
-/lib/firmware/atusb
 /lib/firmware/carl9170-1.fw
 /lib/firmware/cadence
 /lib/firmware/cis
-/lib/firmware/e100
 /lib/firmware/edgeport
 /lib/firmware/ene-ub6250
 /lib/firmware/hfi1_dc8051.fw
@@ -518,22 +527,15 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/hfi1_sbus.fw
 /lib/firmware/imx
 /lib/firmware/inside-secure
-%dir /lib/firmware/intel
-/lib/firmware/intel/ice
 /lib/firmware/isci
 /lib/firmware/ixp4xx
-/lib/firmware/kaweth
 /lib/firmware/keyspan
 /lib/firmware/keyspan_pda
 /lib/firmware/lt9611uxc_fw.bin
 /lib/firmware/matrox
-/lib/firmware/microchip
 /lib/firmware/moxa
 /lib/firmware/mts_*.fw
-/lib/firmware/myri10ge_*.dat
-/lib/firmware/myricom
 /lib/firmware/ositech
-/lib/firmware/phanfw.bin
 /lib/firmware/powervr
 /lib/firmware/qat_4xxx.bin
 /lib/firmware/qat_4xxx_mmp.bin
@@ -550,32 +552,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir /lib/firmware/rockchip
 /lib/firmware/rockchip/dptx.bin
 /lib/firmware/rp2.fw
-/lib/firmware/rsi
-/lib/firmware/rsi_91x.fw
-/lib/firmware/rt2561.bin
-/lib/firmware/rt2561s.bin
-/lib/firmware/rt2661.bin
-/lib/firmware/rt2860.bin
-/lib/firmware/rt2870.bin
-/lib/firmware/rt3070.bin
-/lib/firmware/rt3071.bin
-/lib/firmware/rt3090.bin
-/lib/firmware/rt3290.bin
-/lib/firmware/rt73.bin
-/lib/firmware/sdd_sagrad_*.bin
 /lib/firmware/sun
-/lib/firmware/tehuti
-/lib/firmware/tigon
 /lib/firmware/tlg2300_firmware.bin
 /lib/firmware/tsse_firmware.bin
 /lib/firmware/ttusb-budget
 /lib/firmware/usbdux*_firmware.bin
 /lib/firmware/vicam
-/lib/firmware/vntwusb.fw
-/lib/firmware/vxge
-/lib/firmware/wfx
 /lib/firmware/whiteheat*.fw
-/lib/firmware/wsm_22.bin
 /lib/firmware/yam
 
 %files -n alacritech-firmware
@@ -662,7 +645,6 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/tdmb_nova_12mhz.inp
 /lib/firmware/v4l-cx*.fw
 
-
 %files -n bnx2-firmware
 %defattr(644,root,root,755)
 %doc WHENCE
@@ -691,6 +673,28 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/cxgb3
 /lib/firmware/cxgb4
 
+%files -n ethernet-firmware
+%defattr(644,root,root,755)
+%doc WHENCE LICENSE.airoha LICENCE.e100 LICENSE.ice LICENSE.ice_enhanced LICENCE.kaweth LICENCE.microchip LICENCE.myri10ge_firmware LICENCE.phanfw LICENCE.mediatek
+/lib/firmware/3com
+/lib/firmware/acenic
+/lib/firmware/adaptec
+/lib/firmware/airoha
+/lib/firmware/e100
+%dir /lib/firmware/intel
+/lib/firmware/intel/ice
+/lib/firmware/kaweth
+%dir /lib/firmware/mediatek
+/lib/firmware/mediatek/mt7988
+/lib/firmware/microchip
+/lib/firmware/myri10ge_*.dat
+/lib/firmware/myricom
+/lib/firmware/phanfw.bin
+/lib/firmware/rtl_nic
+/lib/firmware/tehuti
+/lib/firmware/tigon
+/lib/firmware/vxge
+
 %files -n intel-bluetooth-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.ibt_firmware
@@ -853,11 +857,22 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.mediatek LICENCE.ralink_a_mediatek_company_firmware LICENCE.ralink-firmware.txt
 /lib/firmware/mediatek
+%exclude /lib/firmware/mediatek/mt7988
 /lib/firmware/mt7601u.bin
 /lib/firmware/mt7650.bin
 /lib/firmware/mt7662.bin
 /lib/firmware/mt7662_rom_patch.bin
 /lib/firmware/vpu_d.bin
+/lib/firmware/rt2561.bin
+/lib/firmware/rt2561s.bin
+/lib/firmware/rt2661.bin
+/lib/firmware/rt2860.bin
+/lib/firmware/rt2870.bin
+/lib/firmware/rt3070.bin
+/lib/firmware/rt3071.bin
+/lib/firmware/rt3090.bin
+/lib/firmware/rt3290.bin
+/lib/firmware/rt73.bin
 /lib/firmware/vpu_p.bin
 
 %files -n mellanox-firmware
@@ -912,7 +927,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.rtlwifi_firmware.txt README.rtw88
 /lib/firmware/rtl_bt
-/lib/firmware/rtl_nic
 /lib/firmware/rtlwifi
 /lib/firmware/rtw88
 /lib/firmware/rtw89
@@ -960,3 +974,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.ueagle-atm4-firmware
 /lib/firmware/ueagle-atm
+
+%files -n wireless-firmware
+%defattr(644,root,root,755)
+%doc WHENCE LICENCE.agere LICENSE.atmel LICENCE.via_vt6656 LICENCE.wf200
+/lib/firmware/agere_*_fw.bin
+/lib/firmware/atmel
+/lib/firmware/atusb
+/lib/firmware/rsi
+/lib/firmware/rsi_91x.fw
+/lib/firmware/sdd_sagrad_*.bin
+/lib/firmware/wfx
+/lib/firmware/wsm_22.bin
+/lib/firmware/vntwusb.fw