From 9db4de3a18da6ad982e91463133186c8cf8255f8 Mon Sep 17 00:00:00 2001
From: Davide Cavalca <dcavalca@fedoraproject.org>
Date: Jul 26 2023 14:51:52 +0000
Subject: Move mesa to the main repo


---

diff --git a/asahi-repos.spec b/asahi-repos.spec
index 62ac6fd..66f34cd 100644
--- a/asahi-repos.spec
+++ b/asahi-repos.spec
@@ -1,6 +1,6 @@
 Name:           asahi-repos
 Version:        1
-Release:        3
+Release:        4
 Summary:        Additional repositories for Apple Silicon hardware enablement
 
 License:        MIT
@@ -21,6 +21,7 @@ Source:         group_asahi-kernel-edge.repo
 Source:         RPM-GPG-KEY-group_asahi-kernel-edge
 
 Requires:       %{name}-common = %{version}-%{release}
+Conflicts:      %{name}-edge < 1-4
 
 BuildArch:      noarch
 
@@ -40,6 +41,7 @@ Fedora Asahi SIG.
 %package edge
 Summary:        Unstable repositories for Apple Silicon hardware enablement
 Requires:       %{name}-common = %{version}-%{release}
+Conflicts:      %{name} < 1-4
 
 %description edge
 Additional repositories for Apple Silicon hardware enablement maintained by the
@@ -74,14 +76,14 @@ install -Dpm0644 -t %{buildroot}%{_sysconfdir}/pki/rpm-gpg \
 %files common
 %config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-fedora-remix-branding.repo
 %config(noreplace) %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-fedora-remix-branding
+%config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-mesa.repo
+%config(noreplace) %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-mesa
 %config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-u-boot.repo
 %config(noreplace) %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-u-boot
 
 %files edge
 %license LICENSE
 %doc README.md
-%config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-mesa.repo
-%config(noreplace) %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-mesa
 %config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-kernel-edge.repo
 %config(noreplace) %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-kernel-edge
 
@@ -99,6 +101,9 @@ echo 'and then reboot your system.'
 echo
 
 %changelog
+* Wed Jul 26 2023 Davide Cavalca <dcavalca@fedoraproject.org> - 1-4
+- Move mesa to the main repo
+
 * Wed Jun 21 2023 Davide Cavalca <dcavalca@fedoraproject.org> - 1-3
 - Simplify edge switchover instructions in post