From 07563206a4e5acdbf409ee18d9fb5e5c1e8025309b2ccbe3d85a41369ac4958d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 25 Apr 2025 14:26:36 +0200 Subject: [PATCH] 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 verion of filesystem. Relying on the recently introduced provides instructing zypp about the usrmerge is perfect for this usecase. --- kernel-firmware-brcm.changes | 9 +++++++++ kernel-firmware-brcm.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/kernel-firmware-brcm.changes b/kernel-firmware-brcm.changes index 788cfd7..cd90de1 100644 --- a/kernel-firmware-brcm.changes +++ b/kernel-firmware-brcm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Apr 25 12:24:37 UTC 2025 - Dominique Leuenberger + +- 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 + verion of filesystem. Relying on the recently introduced provides + instructing zypp about the usrmerge is perfect for this usecase. + ------------------------------------------------------------------- Tue Feb 11 09:26:37 UTC 2025 - Takashi Iwai diff --git a/kernel-firmware-brcm.spec b/kernel-firmware-brcm.spec index 5b0c9b0..a15dad5 100644 --- a/kernel-firmware-brcm.spec +++ b/kernel-firmware-brcm.spec @@ -47,7 +47,7 @@ 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: bcm43xx-firmware:/lib/firmware/brcm/brcmfmac43430-sdio.bin Supplements: modalias(pci:v000014E4d00004354sv*sd*bc02sc80i*) -- 2.49.0