X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=linux-firmware.spec;h=ccbe8ced2ddef45ca2048681fb24f75baca57ddf;hb=refs%2Fheads%2Fmaster;hp=1a76b1715b564abcb02e39a55069b4307792cb39;hpb=dec2e47751cf94d3406bd94e1ab1e3ef47bfd59c;p=packages%2Flinux-firmware.git

diff --git a/linux-firmware.spec b/linux-firmware.spec
index 1a76b17..55301e0 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,5 +1,5 @@
-%define		rel	2
-%define		ver	20240410
+%define		rel	1
+%define		ver	20240610
 Summary:	Firmware files used by the Linux kernel
 Summary(pl.UTF-8):	Pliki firmware'u używane przez jądro Linuksa
 Name:		linux-firmware
@@ -11,7 +11,7 @@ Group:		Base/Kernel
 #Source0:	https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/%{name}-%{version}.tar.gz
 # upstream tarball
 Source0:	https://www.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.xz
-# Source0-md5:	6bed71700265b8508ef77fe697223120
+# Source0-md5:	b69a23a5f988938926aa37a819ef1002
 URL:		https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
 BuildRequires:	rdfind
 BuildRequires:	tar >= 1:1.22
@@ -72,22 +72,6 @@ Group:		Base/Kernel
 %description -n av-firmware
 Firmware for various audio/video devices
 
-%package -n bnx2-firmware
-Summary:	Firmware for Broadcom NetXtremeII
-License:	Redistributable, no modification permitted
-Group:		Base/Kernel
-
-%description -n bnx2-firmware
-Firmware for Broadcom NetXtremeII
-
-%package -n bnx2x-firmware
-Summary:	Firmware for Broadcom NetXtreme II 10Gb
-License:	Redistributable, no modification permitted
-Group:		Base/Kernel
-
-%description -n bnx2x-firmware
-Firmware for Broadcom NetXtreme II 10Gb
-
 %package -n brcm-firmware
 Summary:	Firmware for Broadcom 802.11 wireless adapters
 License:	Redistributable, no modification permitted
@@ -116,6 +100,8 @@ Firmware for Chelsio T3/T4/T5/T6
 Summary:	Firmware for various ethernet adapters
 License:	Redistributable, no modification permitted
 Group:		Base/Kernel
+Obsoletes:	bnx2-firmware
+Obsoletes:	bnx2x-firmware
 
 %description -n ethernet-firmware
 Firmware for various ethernet adapters
@@ -643,16 +629,6 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/v4l-cx*.fw
 /lib/firmware/vicam
 
-%files -n bnx2-firmware
-%defattr(644,root,root,755)
-%doc WHENCE
-/lib/firmware/bnx2
-
-%files -n bnx2x-firmware
-%defattr(644,root,root,755)
-%doc WHENCE
-/lib/firmware/bnx2x
-
 %files -n brcm-firmware
 %defattr(644,root,root,755)
 %doc WHENCE LICENCE.broadcom_bcm43xx LICENCE.cypress
@@ -678,6 +654,8 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/acenic
 /lib/firmware/adaptec
 /lib/firmware/airoha
+/lib/firmware/bnx2
+/lib/firmware/bnx2x
 /lib/firmware/e100
 %dir /lib/firmware/intel
 /lib/firmware/intel/ice
@@ -938,6 +916,7 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/ti-connectivity
 /lib/firmware/ti-keystone
 /lib/firmware/INT8866RCA2.bin
+/lib/firmware/TAS2XXX2234.bin
 /lib/firmware/TAS2XXX3870.bin
 /lib/firmware/TAS2XXX387D.bin
 /lib/firmware/TAS2XXX387E.bin