Accepting request 1117165 from home:tiwai:branches:Kernel:HEAD

- Add Provides to sub-packages from kernel-firmware (bsc#1214789);
  this will work around the potential conflicts of compressed vs
  uncompressed installations

OBS-URL: https://build.opensuse.org/request/show/1117165
OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=444

kernel-firmware.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct 12 09:53:05 UTC 2023 - Takashi Iwai <tiwai@suse.com>
+
+- Add Provides to sub-packages from kernel-firmware (bsc#1214789);
+  this will work around the potential conflicts of compressed vs
+  uncompressed installations
+
 -------------------------------------------------------------------
 Mon Oct 09 07:10:37 UTC 2023 - tiwai@suse.com
 

kernel-firmware.spec

@@ -114,6 +114,38 @@ Obsoletes:      qlogic-firmware < %{version}
 Conflicts:      filesystem < 84
 %endif
 %if "%{flavor}" == "uncompressed"
+Provides:       %{name}-amdgpu = %{version}
+Provides:       %{name}-ath10k = %{version}
+Provides:       %{name}-ath11k = %{version}
+Provides:       %{name}-atheros = %{version}
+Provides:       %{name}-bluetooth = %{version}
+Provides:       %{name}-bnx2 = %{version}
+Provides:       %{name}-brcm = %{version}
+Provides:       %{name}-chelsio = %{version}
+Provides:       %{name}-dpaa2 = %{version}
+Provides:       %{name}-i915 = %{version}
+Provides:       %{name}-intel = %{version}
+Provides:       %{name}-iwlwifi = %{version}
+Provides:       %{name}-liquidio = %{version}
+Provides:       %{name}-marvell = %{version}
+Provides:       %{name}-media = %{version}
+Provides:       %{name}-mediatek = %{version}
+Provides:       %{name}-mellanox = %{version}
+Provides:       %{name}-mwifiex = %{version}
+Provides:       %{name}-network = %{version}
+Provides:       %{name}-nfp = %{version}
+Provides:       %{name}-nvidia = %{version}
+Provides:       %{name}-platform = %{version}
+Provides:       %{name}-prestera = %{version}
+Provides:       %{name}-qcom = %{version}
+Provides:       %{name}-qlogic = %{version}
+Provides:       %{name}-radeon = %{version}
+Provides:       %{name}-realtek = %{version}
+Provides:       %{name}-serial = %{version}
+Provides:       %{name}-sound = %{version}
+Provides:       %{name}-ti = %{version}
+Provides:       %{name}-ueagle = %{version}
+Provides:       %{name}-usb-network = %{version}
 Provides:       kernel-firmware-uncompressed = %{version}
 %endif
 

kernel-firmware.spec.in

@@ -89,6 +89,7 @@ Conflicts:      filesystem < 84
 %endif
 %if "%{flavor}" == "uncompressed"
 Provides:       kernel-firmware-uncompressed = %{version}
+@@SUBPKGPROVS@@
 %endif
 
 %description

makespec.sh

@@ -65,6 +65,12 @@ sed -e"s/@@VERSION@@/$version/g" | while read line; do
 	done
 	continue
     fi
+    if [ "$line" = "@@SUBPKGPROVS@@" ]; then
+	for t in $topics; do
+	    echo "Provides:       %{name}-$t = %{version}"
+	done
+	continue
+    fi
     if [ "$line" = "@@SUBPACKAGES@@" ]; then
 	for t in $topics; do
 	    define_subpackage $t