From 4fa7c3ac85220e0ac8160170b941db506910e053 Mon Sep 17 00:00:00 2001
From: Janne Grunau <janne-fdr@jannau.net>
Date: Jul 23 2025 08:02:40 +0000
Subject: [PATCH 1/2] Drop mesa-asahi-24.08-flatpak as the 24.08 FDO runtime ships mesa-25.1


---

diff --git a/asahi-platform-metapackage.spec b/asahi-platform-metapackage.spec
index 9ae4d8d..0f0730c 100644
--- a/asahi-platform-metapackage.spec
+++ b/asahi-platform-metapackage.spec
@@ -54,6 +54,12 @@ Conflicts:      kernel-64k-debug-core
 Conflicts:      kernel-64k-debug-devel
 %dnl drop firefox subpackage as the arch override in the UA is no longer needed
 Obsoletes:      %{name}-firefox < 22
+%dnl phase out mesa-asahi-*-flatpak packages either due to EOL or shipping mesa with asahi drivers
+Obsoletes:      mesa-asahi-22.08-flatpak < 25.0
+Obsoletes:      mesa-asahi-24.08-flatpak < 25.2
+%dnl nothing should depend on these but add provides anyway
+Provides:       mesa-asahi-22.08-flatpak
+Provides:       mesa-asahi-24.08-flatpak
 
 %description core
 This package declares the core dependencies for the Asahi platform.
@@ -109,11 +115,7 @@ This package declares the KDE Plasma dependencies for the Asahi platform.
 
 %package flatpak
 Summary:        Metapackage declaring Flatpak support Asahi platform dependencies
-# obsolete mesa-asahi-22.08-flatpak at the end of 2024. The SDK became EOL
-# at the end of August 2024.
-Obsoletes:      mesa-asahi-22.08-flatpak < 25.0
 Requires:       mesa-asahi-23.08-flatpak
-Requires:       mesa-asahi-24.08-flatpak
 
 %description flatpak
 This package declares the Flatpak dependencies for the Asahi platform. This are primarily

From 5794dca17e48f475a6925f900acdb9570b97eeb4 Mon Sep 17 00:00:00 2001
From: Janne Grunau <janne-fdr@jannau.net>
Date: Jul 23 2025 14:00:39 +0000
Subject: [PATCH 2/2] Drop mesa-asahi-*-flatpak for Fedora 43


By the time Fedora 43 will be released all non-EOL FDO runtimes will
have mesa 25.1 or later with asahi/honeykrisp drivers.

---

diff --git a/asahi-platform-metapackage.spec b/asahi-platform-metapackage.spec
index 0f0730c..775992b 100644
--- a/asahi-platform-metapackage.spec
+++ b/asahi-platform-metapackage.spec
@@ -3,7 +3,7 @@
 
 Name:           asahi-platform-metapackage
 Version:        0
-Release:        23%{?dist}
+Release:        24%{?dist}
 Summary:        Metapackage declaring Asahi platform dependencies
 Group:          Metapackages
 License:        MIT
@@ -15,7 +15,9 @@ BuildRequires:  systemd-rpm-macros
 Requires:       %{name}-core = %{version}-%{release}
 Requires:       (%{name}-audio = %{version}-%{release} if pipewire)
 Requires:       (%{name}-plasma = %{version}-%{release} if plasma-desktop)
+%if 0%{?fedora} && 0%{?fedora} < 43
 Recommends:     (%{name}-flatpak = %{version}-%{release} if flatpak)
+%endif
 Requires:       (%{name}-fex = %{version}-%{release} if fex-emu)
 %dnl If/when we have desktop subpackages or whatever, we can make them
 %dnl conditional dependencies with the following format:
@@ -60,6 +62,12 @@ Obsoletes:      mesa-asahi-24.08-flatpak < 25.2
 %dnl nothing should depend on these but add provides anyway
 Provides:       mesa-asahi-22.08-flatpak
 Provides:       mesa-asahi-24.08-flatpak
+%if 0%{?fedora} && 0%{?fedora} >= 43
+Obsoletes:      mesa-asahi-23.08-flatpak < 25.2
+Provides:       mesa-asahi-23.08-flatpak
+Obsoletes:      asahi-platform-metapackage-flatpak < 24
+Provides:       asahi-platform-metapackage-flatpak
+%endif
 
 %description core
 This package declares the core dependencies for the Asahi platform.
@@ -113,6 +121,7 @@ This package declares the KDE Plasma dependencies for the Asahi platform.
 
 %dnl -------------------------------------------------------------------
 
+%if 0%{?fedora} && 0%{?fedora} < 43
 %package flatpak
 Summary:        Metapackage declaring Flatpak support Asahi platform dependencies
 Requires:       mesa-asahi-23.08-flatpak
@@ -123,6 +132,7 @@ GPU driver extensions for supported runtimes.
 
 %files flatpak
 %dnl No files to ship
+%endif
 
 %dnl -------------------------------------------------------------------
 
@@ -203,6 +213,10 @@ install -Dpm0755 -t %{buildroot}%{_libexecdir}/%{name}-desktop %SOURCE1
 %endif
 
 %changelog
+* Wed Jul 23 2025 Janne Grunau <janne-fdr@jannau.net> - 0-24
+- Drop mesa-asahi-*-flatpak for Fedora 43
+- Drop mesa-asahi-24.08-flatpak as the 24.08 FDO runtime ships mesa-25.1
+
 * Mon Apr 28 2025 Janne Grunau <janne-fdr@jannau.net> - 0-23
 - Add script to adjust grub2 config to Fedora Desktop defaults
 - Cleanup orphaned grub2 efi modules (rhbz#2361849)