Do not conflict filesystem < 84

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.

kernel-firmware-marvell.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+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>
 

kernel-firmware-marvell.spec

@@ -26,32 +26,26 @@ Name:           kernel-firmware-marvell
 Version:        20250206
 Release:        0
 Summary:        Kernel firmware files for Marvell network drivers
-License:        SUSE-Firmware AND GPL-2.0-or-later
+License:        GPL-2.0-or-later AND SUSE-Firmware
 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/20250425.tar.gz#/kernel-firmware-tools-20250425.tar.gz
 Source2:        %{name}-rpmlintrc
 Source3:        git_id
 Source10:       aliases
 BuildRequires:  suse-module-tools
 Requires(post): %{_bindir}/mkdir
 Requires(post): %{_bindir}/touch
-Requires(postun):%{_bindir}/mkdir
-Requires(postun):%{_bindir}/touch
+Requires(postun): %{_bindir}/mkdir
+Requires(postun): %{_bindir}/touch
 Requires(post): dracut >= 049
 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
-Supplements:    modalias(sdio:c*v02DFd9103*)
-Supplements:    modalias(sdio:c*v02DFd9104*)
-Supplements:    modalias(usb:v05A3p8388d*dc*dsc*dp*ic*isc*ip*in*)
-Supplements:    modalias(usb:v1286p2001d*dc*dsc*dp*ic*isc*ip*in*)
 Supplements:    modalias(pci:v000011ABd00002A0Asv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v000011ABd00002A0Csv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v000011ABd00002A24sv*sd*bc*sc*i*)
@@ -62,15 +56,17 @@ Supplements:    modalias(pci:v000011ABd00002A41sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v000011ABd00002A42sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v000011ABd00002A43sv*sd*bc*sc*i*)
 Supplements:    modalias(pci:v000011ABd00002B36sv*sd*bc*sc*i*)
+Supplements:    modalias(sdio:c*v02DFd9103*)
+Supplements:    modalias(sdio:c*v02DFd9104*)
 Supplements:    modalias(usb:v05A3p8388d*dc*dsc*dp*ic*isc*ip*in*)
 Supplements:    modalias(usb:v1286p2001d*dc*dsc*dp*ic*isc*ip*in*)
 
 %description
 This package contains kernel firmware files for Marvell 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 marvell < WHENCE > WHENCE.new
 mv WHENCE.new WHENCE