From 727cb3043e923c4bd037beaaa158874bb9ee1e9e Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: May 11 2024 13:05:21 +0000
Subject: [PATCH 1/3] Use the correct appstream "id"


`appstreamcli sysinfo` complains about "Unable to find operating system
component 'org.fedora-asahi-remix.fedora-asahi-remix'!". After adjusting
the id the command reports "Operating System Details:" and Discover
offers a system upgrade to "Fedora Linux Asahi Remix 40" on a f39 based
install.

---

diff --git a/fedora-asahi-remix-appstream-metadata.spec b/fedora-asahi-remix-appstream-metadata.spec
index 64eaae7..744d89e 100644
--- a/fedora-asahi-remix-appstream-metadata.spec
+++ b/fedora-asahi-remix-appstream-metadata.spec
@@ -1,7 +1,7 @@
 Summary:        Operating System AppStream Metadata for Fedora Asahi Remix
 Name:           fedora-asahi-remix-appstream-metadata
 # Use the time of the last metadata update as version
-Version:        20240508
+Version:        20240511
 Release:        1
 License:        MIT
 URL:            https://fedora-asahi-remix.org/
@@ -32,5 +32,8 @@ install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/licenses/%{name}/LICENSE
 %{_datadir}/metainfo/org.fedora_asahi_remix.metainfo.xml
 
 %changelog
+* Sat May 11 2024 Janne Grunau <janne-fdr@jananu.net> - 20240511-1
+- Fix "id" to what appstream expects
+
 * Wed May 08 2024 Davide Cavalca <dcavalca@fedoraproject.org> - 20240508-1
 - Rename and update for Fedora Asahi Remix
diff --git a/org.fedora_asahi_remix.metainfo.xml b/org.fedora_asahi_remix.metainfo.xml
index cedae55..cbef703 100644
--- a/org.fedora_asahi_remix.metainfo.xml
+++ b/org.fedora_asahi_remix.metainfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="operating-system">
-  <id>org.fedora_asahi_remix</id>
+  <id>org.fedora-asahi-remix.fedora-asahi-remix</id>
   <name>Fedora Asahi Remix</name>
   <summary>Fedora Asahi Remix distribution from the Fedora Asahi SIG</summary>
   <description>

From 4e79d976f722c2783a81c840a1b3e9de1005f408 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: May 11 2024 13:05:29 +0000
Subject: [PATCH 2/3] Fix LICENSE handling


`%license` will copy the license file itself if it is in the build dir.
No need to install it separately.

---

diff --git a/fedora-asahi-remix-appstream-metadata.spec b/fedora-asahi-remix-appstream-metadata.spec
index 744d89e..52995d7 100644
--- a/fedora-asahi-remix-appstream-metadata.spec
+++ b/fedora-asahi-remix-appstream-metadata.spec
@@ -20,12 +20,12 @@ Operating System AppStream Metadata for Fedora Asahi Remix
 %if 0%{?fedora} < 40
 sed -i '/<release / s/type="snapshot"/type="development"/' %{SOURCE1}
 %endif
+cp -p %SOURCE2 .
 
 %build
 
 %install
 install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/org.fedora_asahi_remix.metainfo.xml
-install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/licenses/%{name}/LICENSE
 
 %files
 %license LICENSE

From 0531264c54e5cfc5749a22dcec1edb92929c3129 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: May 11 2024 13:06:06 +0000
Subject: [PATCH 3/3] Make `Release:` dist specific


appstream / packagekit based updates can not handle (non-)updates of not
dist versioned packages. Update transaction fails because the package is
already installed.

---

diff --git a/fedora-asahi-remix-appstream-metadata.spec b/fedora-asahi-remix-appstream-metadata.spec
index 52995d7..5882b08 100644
--- a/fedora-asahi-remix-appstream-metadata.spec
+++ b/fedora-asahi-remix-appstream-metadata.spec
@@ -2,7 +2,7 @@ Summary:        Operating System AppStream Metadata for Fedora Asahi Remix
 Name:           fedora-asahi-remix-appstream-metadata
 # Use the time of the last metadata update as version
 Version:        20240511
-Release:        1
+Release:        2%{?dist}
 License:        MIT
 URL:            https://fedora-asahi-remix.org/
 Source1:        org.fedora_asahi_remix.metainfo.xml
@@ -32,6 +32,11 @@ install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/org.fedora_asahi_r
 %{_datadir}/metainfo/org.fedora_asahi_remix.metainfo.xml
 
 %changelog
+* Sat May 11 2024 Janne Grunau <janne-fdr@jananu.net> - 20240511-2
+- Make Release dist specific, required for appstream based updates
+- Fix LICENSE handling. `%license` handles it correctly on its own if
+  the file is copied to the build dir
+
 * Sat May 11 2024 Janne Grunau <janne-fdr@jananu.net> - 20240511-1
 - Fix "id" to what appstream expects