Update to version 20250717 (git commit 6fc20e018cca)

* WHENCE: extract more license statements

git_id

@@ -1 +1 @@
-aaae2fb60f75b07d9c249ebe668524f7ddf51243
+6fc20e018cca0ab954fe249afb60ac5af69f102a

kernel-firmware-qlogic.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Jul 18 14:39:25 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Update to version 20250717 (git commit 6fc20e018cca):
+  * WHENCE: extract more license statements
+
+-------------------------------------------------------------------
+Fri Apr 25 13:52:22 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Change conflicts filesystem < 84 to conflicts filesystem without
+  may-perform-usrmerge. Version 84 is specific to Tumbleweed; CODE
+  16 uses Version 16; yet we need to ensure we get an up-to-date
+  version of filesystem. Relying on the recently introduced provides
+  instructing zypp about the usrmerge is perfect for this use case.
+
 -------------------------------------------------------------------
 Tue Feb 11 09:26:37 UTC 2025 - Takashi Iwai <tiwai@suse.com>
 
@@ -5216,7 +5231,6 @@ Wed Nov 24 20:02:38 UTC 2010 - coolo@novell.com
 - update to 20101113 tarball for 2.6.36+ kernel
 
 -------------------------------------------------------------------
-
 Thu Jul  1 17:11:34 UTC 2010 - gregkh@suse.de
 
 - update to the 20100617 tarball, which has lots of updates that

kernel-firmware-qlogic.spec

@@ -20,18 +20,17 @@
 %define _firmwaredir /lib/firmware
 %endif
 %define __ksyms_path ^%{_firmwaredir}
-%define git_version aaae2fb60f75b07d9c249ebe668524f7ddf51243
+%define git_version 6fc20e018cca0ab954fe249afb60ac5af69f102a
 
 Name:           kernel-firmware-qlogic
-Version:        20250206
+Version:        20250717
 Release:        0
 Summary:        Kernel firmware files for QLogic network drivers
-License:        SUSE-Firmware AND GPL-2.0-or-later AND GPL-2.0-only
+License:        GPL-2.0-or-later AND SUSE-Firmware AND GPL-2.0-only
 Group:          System/Kernel
 URL:            https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
 Source0:        %{name}-%{version}.tar.xz
-# URL:          https://github.com/openSUSE/kernel-firmware-tools/
-Source1:        kernel-firmware-tools-20250211.tar.xz
+Source1:        https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250718.tar.gz#/kernel-firmware-tools-20250718.tar.gz
 Source2:        %{name}-rpmlintrc
 Source3:        git_id
 Source10:       aliases
@@ -50,42 +49,26 @@ Conflicts:      kernel < 5.3
 Conflicts:      kernel-firmware-uncompressed
 BuildArch:      noarch
 %if 0%{?suse_version} >= 1550
-# make sure we have post-usrmerge filesystem package on TW
-Conflicts:      filesystem < 84
+Conflicts:      (filesystem without may-perform-usrmerge)
 %endif
 Provides:       qlogic-firmware = %{version}
 Obsoletes:      qlogic-firmware < %{version}
-Supplements:    modalias(pci:v00001657d00000013sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001657d00000014sv*sd*bc0Csc04i00*)
-Supplements:    modalias(pci:v00001657d00000017sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001657d00000021sv*sd*bc0Csc04i00*)
-Supplements:    modalias(pci:v00001657d00000022sv*sd*bc0Csc04i00*)
-Supplements:    modalias(pci:v00001657d00000023sv*sd*bc0Csc04i00*)
-Supplements:    modalias(pci:v00001657d00000014sv*sd*bc02sc00i*)
-Supplements:    modalias(pci:v00001657d00000022sv*sd*bc02sc00i*)
 Supplements:    modalias(fs-ipathfs)
-Supplements:    modalias(pci:v00001077d00007220sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001077d00007322sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001FC1d00000010sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001077d00001634sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001077d00001636sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001077d00001644sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001077d00001654sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001077d00001656sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001077d00001664sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001077d00001666sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001077d00008070sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001077d00008090sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001077d0000165Csv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001077d00008080sv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001077d0000165Esv*sd*bc*sc*i*)
-Supplements:    modalias(pci:v00001077d00008084sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00001016sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00001020sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00001080sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00001216sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00001240sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00001280sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001077d00001634sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001077d00001636sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001077d00001644sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001077d00001654sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001077d00001656sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001077d0000165Csv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001077d0000165Esv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001077d00001664sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001077d00001666sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00002031sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00002061sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00002071sv*sd*bc*sc*i*)
@@ -107,19 +90,34 @@ Supplements:    modalias(pci:v00001077d00005422sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00005432sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00006312sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00006322sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001077d00007220sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001077d00007322sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00008001sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00008021sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00008031sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00008044sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001077d00008070sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001077d00008080sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001077d00008084sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001077d00008090sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d00008432sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v00001077d0000F001sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001657d00000013sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001657d00000014sv*sd*bc02sc00i*)
+Supplements:    modalias(pci:v00001657d00000014sv*sd*bc0Csc04i00*)
+Supplements:    modalias(pci:v00001657d00000017sv*sd*bc*sc*i*)
+Supplements:    modalias(pci:v00001657d00000021sv*sd*bc0Csc04i00*)
+Supplements:    modalias(pci:v00001657d00000022sv*sd*bc02sc00i*)
+Supplements:    modalias(pci:v00001657d00000022sv*sd*bc0Csc04i00*)
+Supplements:    modalias(pci:v00001657d00000023sv*sd*bc0Csc04i00*)
+Supplements:    modalias(pci:v00001FC1d00000010sv*sd*bc*sc*i*)
 
 %description
 This package contains kernel firmware files for QLogic network drivers.
 
-
 %prep
-%autosetup -a1 -p1
+%autosetup -p1
+tar xf %{S:1} --strip-components=1
 # strip down WHENCE for the topic
 scripts/strip-topic-whence.sh qlogic < WHENCE > WHENCE.new
 mv WHENCE.new WHENCE