From 2a4e459104d1baca4dbb6bc515ec3e09d68a7fcc Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Wed, 29 Jul 2020 21:23:04 +0200
Subject: [PATCH] Install appdata for both the Platform and the Sdk

This should make both the runtime and the sdk correctly show up in gnome-software.

I am not sure what to do with the license field; I've left it as
GPL-2.0+ for now, matching what the freedesktop and gnome runtimes are
doing, but it's clearly not correct (we include many libraries with many
different licenses, not just GPL-2.0+). I've left a FIXME in the appdata
files for now.
---
 flatpak-runtime-config.spec            | 15 +++++++++++++--
 org.fedoraproject.Platform.appdata.xml | 20 ++++++++++++++++++++
 org.fedoraproject.Sdk.appdata.xml      | 20 ++++++++++++++++++++
 3 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 org.fedoraproject.Platform.appdata.xml
 create mode 100644 org.fedoraproject.Sdk.appdata.xml

diff --git a/flatpak-runtime-config.spec b/flatpak-runtime-config.spec
index d38b650..a795c8a 100644
--- a/flatpak-runtime-config.spec
+++ b/flatpak-runtime-config.spec
@@ -1,9 +1,11 @@
 Name:           flatpak-runtime-config
-Version:        32
-Release:        2%{?dist}
+Version:        33
+Release:        1%{?dist}
 Summary:        Configuration files that live inside the flatpak runtime
 Source1:        50-flatpak.conf
 Source2:        usercustomize.py
+Source3:        org.fedoraproject.Platform.appdata.xml
+Source4:        org.fedoraproject.Sdk.appdata.xml
 
 License:        MIT
 
@@ -34,6 +36,11 @@ for d in %{python3_sitelib} ; do
     install -t $RPM_BUILD_ROOT/$d -m 0644 %{SOURCE2}
 done
 
+# Install appdata for both the Platform and the Sdk
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
+install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE3}
+install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE4}
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 echo "/app/%{_lib}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/app.conf
 
@@ -63,10 +70,14 @@ HOME=/root /usr/bin/fc-cache -s
 %dir %{_prefix}/cache
 %dir %{_prefix}/cache/fontconfig
 %{python3_sitelib}
+%{_datadir}/metainfo/*.appdata.xml
 %{_sysconfdir}/fonts/conf.d/*
 %{_sysconfdir}/ld.so.conf.d/app.conf
 
 %changelog
+* Wed Jul 29 2020 Kalev Lember <klember@redhat.com> - 33-1
+- Install appdata for both the Platform and the Sdk
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 32-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/org.fedoraproject.Platform.appdata.xml b/org.fedoraproject.Platform.appdata.xml
new file mode 100644
index 0000000..7950a84
--- /dev/null
+++ b/org.fedoraproject.Platform.appdata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="runtime">
+  <id>org.fedoraproject.Platform</id>
+  <metadata_license>CC0</metadata_license>
+  <!-- FIXME -->
+  <project_license>GPL-2.0+</project_license>
+  <name>Fedora Platform</name>
+  <summary>Shared libraries</summary>
+  <releases>
+    <release version="32" date="2020-04-28"/>
+  </releases>
+  <description>
+    <p>
+      The Fedora Platform is a runtime for Flatpak applications. It contains
+      common libraries that are shared between desktop applications, including
+      GTK 3, GStreamer, Qt 5, Mesa, SDL2, and many others.
+    </p>
+  </description>
+  <url type="homepage">https://fedoraproject.org/</url>
+</component>
diff --git a/org.fedoraproject.Sdk.appdata.xml b/org.fedoraproject.Sdk.appdata.xml
new file mode 100644
index 0000000..a2016e7
--- /dev/null
+++ b/org.fedoraproject.Sdk.appdata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="runtime">
+  <id>org.fedoraproject.Sdk</id>
+  <metadata_license>CC0</metadata_license>
+  <!-- FIXME -->
+  <project_license>GPL-2.0+</project_license>
+  <name>Fedora SDK</name>
+  <summary>Tools and headers for developing applications</summary>
+  <releases>
+    <release version="32" date="2020-04-28"/>
+  </releases>
+  <description>
+    <p>
+      The Fedora Sdk is the development runtime that you can use to produce applications using
+      the Fedora Platform runtime. It contains everything that is in the platform, as well
+      as build and debugging tools and headers for the libraries.
+    </p>
+  </description>
+  <url type="homepage">https://fedoraproject.org/</url>
+</component>