X-Git-Url: https://git.tld-linux.org/?p=packages%2Flinux-firmware.git;a=blobdiff_plain;f=linux-firmware.spec;h=68d7d5f29b501d75cbd0baeb120a62fe18cd9da7;hp=eb4bc9876bfa30afaea9ce1162546b7f60ae4c70;hb=f0e98462a64cc5503d0ce87e0681f120bd1a8995;hpb=e4d3c1c13f125fb123d3e9138a81716598e149d0

diff --git a/linux-firmware.spec b/linux-firmware.spec
index eb4bc98..68d7d5f 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,7 +1,5 @@
-# TODO
-# - subpackages for various firmwares?
-%define		rel	1
-%define		ver	20180507
+%define		rel	2
+%define		ver	20190514
 Summary:	Firmware files used by the Linux kernel
 Summary(pl.UTF-8):	Pliki firmware'u używane przez jądro Linuksa
 Name:		linux-firmware
@@ -9,10 +7,11 @@ Version:	%{ver}
 Release:	%{rel}
 License:	GPL+ and GPL v2+ and MIT and Redistributable, no modification permitted
 Group:		Base/Kernel
-Source0:	https://src.fedoraproject.org/repo/pkgs/linux-firmware/%{name}-%{version}.tar.xz/sha512/55f5732d0d38727821fe676b1fa1531a91d30ffc91a4f5de6adadd985d7771b8a4757b6230f9228cf5371067c10b6191bfa5d7a2c5c79b696c4e1888dd6b1ec2/linux-firmware-%{version}.tar.xz
-# Source0-md5:	838f105f4982e549a2f5bc911c59f334
+Source0:	https://src.fedoraproject.org/repo/pkgs/linux-firmware/%{name}-%{version}.tar.xz/sha512/6de58e28892b06d88a74750957596eb17227a684a9603ff29a01f3c5712f40a79128aec3a94dfb71d0cfabd918a9add4216d4f8e9ef91c5c40859fb160422685/linux-firmware-%{version}.tar.xz
+# Source0-md5:	cb27c6f0348b45794ca1af7309d8632c
 URL:		https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
-Obsoletes:	microcode-data-amd
+Requires:	microcode-data-amd
+Requires:	microcode-data-intel
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -162,6 +161,17 @@ 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 iwl22260-firmware
+Summary:	Firmware for Intel(R) Centrino Wireless-N 22260 Series Adapters
+License:	Redistributable, no modification permitted
+Group:		Base/Kernel
+
+%description -n iwl22260-firmware
+This package contains the firmware required by the Intel wireless
+drivers for Linux to support the iwl22260 hardware. 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
 License:	Redistributable, no modification permitted
@@ -370,6 +380,8 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/lib/firmware
 cp -a . $RPM_BUILD_ROOT/lib/firmware
 %{__rm} $RPM_BUILD_ROOT/lib/firmware/{GPL-2,GPL-3,LICENCE.*,LICENSE.*,README,TDA7706_OM_v*_boot.txt,WHENCE,check_whence.py}
+# For AMD CPU microcode see microcode-data-amd.spec
+%{__rm} -r $RPM_BUILD_ROOT/lib/firmware/amd-ucode
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -384,7 +396,7 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/adaptec
 /lib/firmware/advansys
 /lib/firmware/agere_*_fw.bin
-/lib/firmware/amd-ucode
+/lib/firmware/amd
 /lib/firmware/as102_data1_st.hex
 /lib/firmware/as102_data2_st.hex
 /lib/firmware/atmel
@@ -392,12 +404,14 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/atusb
 /lib/firmware/av7110
 /lib/firmware/carl9170-1.fw
+/lib/firmware/cadence
 /lib/firmware/cis
 /lib/firmware/cmmb_*_12mhz.inp
 /lib/firmware/cpia2
 /lib/firmware/ctefx.bin
 /lib/firmware/ctspeq.bin
 /lib/firmware/dabusb
+/lib/firmware/dpaa2
 /lib/firmware/dsp56k
 /lib/firmware/dvb-fe-xc4000-*.fw
 /lib/firmware/dvb-fe-xc5000c-*.fw
@@ -412,8 +426,7 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/emi26
 /lib/firmware/emi62
 /lib/firmware/ene-ub6250
-/lib/firmware/ess/maestro3_assp_kernel.fw
-/lib/firmware/ess/maestro3_assp_minisrc.fw
+/lib/firmware/ess
 /lib/firmware/f2255usb.bin
 /lib/firmware/go7007
 /lib/firmware/hfi1_dc8051.fw
@@ -435,10 +448,14 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/kaweth
 /lib/firmware/keyspan
 /lib/firmware/keyspan_pda
+%dir /lib/firmware/korg
 /lib/firmware/korg/k1212.dsp
 /lib/firmware/lgs8g75.fw
 /lib/firmware/matrox
+/lib/firmware/mediatek
 /lib/firmware/mellanox
+/lib/firmware/meson
+/lib/firmware/microchip
 /lib/firmware/moxa
 /lib/firmware/mt7601u.bin
 /lib/firmware/mt7650.bin
@@ -479,12 +496,14 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/rtl_bt
 /lib/firmware/rtl_nic
 /lib/firmware/rtlwifi
+/lib/firmware/rtw88
 /lib/firmware/s2250*.fw
 /lib/firmware/s5p-mfc.fw
 /lib/firmware/s5p-mfc-v6.fw
 /lib/firmware/s5p-mfc-v6-v2.fw
 /lib/firmware/s5p-mfc-v7.fw
 /lib/firmware/s5p-mfc-v8.fw
+%dir /lib/firmware/sb16
 /lib/firmware/sb16/alaw_main.csp
 /lib/firmware/sb16/ima_adpcm_capture.csp
 /lib/firmware/sb16/ima_adpcm_init.csp
@@ -517,6 +536,7 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/wil6210.fw
 /lib/firmware/wsm_22.bin
 /lib/firmware/yam
+%dir /lib/firmware/yamaha
 /lib/firmware/yamaha/ds1_ctrl.fw
 /lib/firmware/yamaha/ds1_dsp.fw
 /lib/firmware/yamaha/ds1e_ctrl.fw
@@ -615,6 +635,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc WHENCE LICENCE.iwlwifi_firmware
 /lib/firmware/iwlwifi-2030-*.ucode
 
+%files -n iwl22260-firmware
+%defattr(644,root,root,755)
+%doc WHENCE LICENCE.iwlwifi_firmware
+/lib/firmware/iwlwifi-cc-*.ucode
+
 %files -n iwl3160-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.iwlwifi_firmware