From 745447d7c7828614a30364ee9edfeb6d99e28513 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Jan 19 2026 11:48:00 +0000 Subject: Add DNF5 vendor transition configuration for F43+ This will let us support transitioning packages from Fedora Asahi Remix back to Fedora Linux as packages are upstreamed. This is only reliably workable as long as everything uses DNF5, which is why this is gated on Fedora Linux 43 and higher. --- diff --git a/asahi-platform-metapackage.spec b/asahi-platform-metapackage.spec index f9a7004..54cb03d 100644 --- a/asahi-platform-metapackage.spec +++ b/asahi-platform-metapackage.spec @@ -3,7 +3,7 @@ Name: asahi-platform-metapackage Version: 0 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Metapackage declaring Asahi platform dependencies Group: Metapackages License: MIT @@ -11,6 +11,8 @@ URL: https://pagure.io/fedora-asahi/asahi-platform-metapackage ExclusiveArch: aarch64 Source1: FAR_grub2_config_fixup.sh Source2: 10-asahi-browser-apple.conf +Source3: dnf5vendor-asahicopr-to-asahitransition.toml +Source4: dnf5vendor-asahitransition-to-fedora.toml BuildRequires: systemd-rpm-macros Requires: %{name}-core = %{version}-%{release} @@ -30,6 +32,10 @@ software dependencies. %files %{_sysconfdir}/dnf/protected.d/%{name}.conf +%if 0%{?fedora} >= 43 +%{_datadir}/dnf5/vendors.d/asahicopr-to-asahitransition.toml +%{_datadir}/dnf5/vendors.d/asahitransition-to-fedora.toml +%endif %dnl ------------------------------------------------------------------- @@ -197,6 +203,13 @@ This package contains asahi specific mesa driconf files mkdir -p %{buildroot}%{_sysconfdir}/dnf/protected.d echo "%{name}" > %{buildroot}%{_sysconfdir}/dnf/protected.d/%{name}.conf +%if 0%{?fedora} >= 43 +# Install DNF vendor policy configuration, cf. dnf5.conf-vendorpolicy(5) +mkdir -p %{buildroot}%{_datadir}/dnf5/vendors.d +install -pm 0644 %{SOURCE3} %{buildroot}%{_datadir}/dnf5/vendors.d/asahicopr-to-asahitransition.toml +install -pm 0644 %{SOURCE4} %{buildroot}%{_datadir}/dnf5/vendors.d/asahitransition-to-fedora.toml +%endif + # Workaround for gtk4 bug: # https://gitlab.gnome.org/GNOME/gtk/-/issues/7229 # fixed in gtk4 4.18 available in Fedora 42 @@ -220,6 +233,9 @@ install -Dpm0755 -t %{buildroot}%{_libexecdir}/%{name}-desktop %SOURCE1 install -Dpm0644 -t %{buildroot}%{_datadir}/drirc.d %SOURCE2 %changelog +* Mon Jan 19 2026 Neal Gompa - 0-29 +- Add DNF5 vendor transition configuration for F43+ + * Sat Jan 10 2026 Neal Gompa - 0-28 - Require the DNF5 backend if PackageKit is installed for F43+ diff --git a/dnf5vendor-asahicopr-to-asahitransition.toml b/dnf5vendor-asahicopr-to-asahitransition.toml new file mode 100644 index 0000000..f98e8ba --- /dev/null +++ b/dnf5vendor-asahicopr-to-asahitransition.toml @@ -0,0 +1,9 @@ +version = '1.0' + +[[outgoing_vendors]] +comparator = "EXACT" +vendor = "Fedora Copr - group @asahi" + +[[incoming_vendors]] +comparator = "EXACT" +vendor = "Fedora Asahi - Transitional" diff --git a/dnf5vendor-asahitransition-to-fedora.toml b/dnf5vendor-asahitransition-to-fedora.toml new file mode 100644 index 0000000..fe14425 --- /dev/null +++ b/dnf5vendor-asahitransition-to-fedora.toml @@ -0,0 +1,9 @@ +version = '1.0' + +[[outgoing_vendors]] +comparator = "EXACT" +vendor = "Fedora Asahi - Transitional" + +[[incoming_vendors]] +comparator = "EXACT" +vendor = "Fedora Project"