From a84f38e2364396358ab39c7eaa8a73b38151167987497d1a7907672cc5b8d183 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Thu, 12 Oct 2023 10:08:19 +0000
Subject: [PATCH] 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 |  7 +++++++
 kernel-firmware.spec    | 32 ++++++++++++++++++++++++++++++++
 kernel-firmware.spec.in |  1 +
 makespec.sh             |  6 ++++++
 4 files changed, 46 insertions(+)

diff --git a/kernel-firmware.changes b/kernel-firmware.changes
index 3994067..7dc87e7 100644
--- a/kernel-firmware.changes
+++ b/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
 
diff --git a/kernel-firmware.spec b/kernel-firmware.spec
index e3180c9..7ad6d88 100644
--- a/kernel-firmware.spec
+++ b/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
 
diff --git a/kernel-firmware.spec.in b/kernel-firmware.spec.in
index ebf50ec..52831bb 100644
--- a/kernel-firmware.spec.in
+++ b/kernel-firmware.spec.in
@@ -89,6 +89,7 @@ Conflicts:      filesystem < 84
 %endif
 %if "%{flavor}" == "uncompressed"
 Provides:       kernel-firmware-uncompressed = %{version}
+@@SUBPKGPROVS@@
 %endif
 
 %description
diff --git a/makespec.sh b/makespec.sh
index ae6d05e..3f05329 100644
--- a/makespec.sh
+++ b/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