From a81a900482ff5e1020915e74a6756bf87292de5a Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Sat, 8 Jun 2024 14:25:25 -0400 Subject: [PATCH] Adapt to centos-stream and RHEL for el10 Install appropriate metadata for a RHEL or Flatpak runtime (depending on the distribution), remove the KDE runtime metadata inherited from Fedora. Related: RHEL-24326 --- com.redhat.Platform.appdata.xml | 20 ++++++++++++++++ com.redhat.Sdk.appdata.xml | 19 +++++++++++++++ flatpak-runtime-config.spec | 21 +++++++++-------- org.centos.stream.Platform.appdata.xml | 19 +++++++++++++++ org.centos.stream.Sdk.appdata.xml | 19 +++++++++++++++ org.fedoraproject.KDE5Platform.appdata.xml | 23 ------------------ org.fedoraproject.KDE5Sdk.appdata.xml | 23 ------------------ org.fedoraproject.KDE6Platform.appdata.xml | 23 ------------------ org.fedoraproject.KDE6Sdk.appdata.xml | 23 ------------------ org.fedoraproject.Platform.appdata.xml | 27 ---------------------- org.fedoraproject.Sdk.appdata.xml | 27 ---------------------- 11 files changed, 89 insertions(+), 155 deletions(-) create mode 100644 com.redhat.Platform.appdata.xml create mode 100644 com.redhat.Sdk.appdata.xml create mode 100644 org.centos.stream.Platform.appdata.xml create mode 100644 org.centos.stream.Sdk.appdata.xml delete mode 100644 org.fedoraproject.KDE5Platform.appdata.xml delete mode 100644 org.fedoraproject.KDE5Sdk.appdata.xml delete mode 100644 org.fedoraproject.KDE6Platform.appdata.xml delete mode 100644 org.fedoraproject.KDE6Sdk.appdata.xml delete mode 100644 org.fedoraproject.Platform.appdata.xml delete mode 100644 org.fedoraproject.Sdk.appdata.xml diff --git a/com.redhat.Platform.appdata.xml b/com.redhat.Platform.appdata.xml new file mode 100644 index 0000000..4ab826d --- /dev/null +++ b/com.redhat.Platform.appdata.xml @@ -0,0 +1,20 @@ + + + com.redhat.Platform + CC0-1.0 + https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel + Red Hat Platform + Shared libraries + + + + + +

+ The Red Hat Platform is a runtime for Flatpak applications. It contains + common libraries that are shared between desktop applications, including + GTK 3, GStreamer, Mesa, and many others. +

+ + https://redhat.com/ + diff --git a/com.redhat.Sdk.appdata.xml b/com.redhat.Sdk.appdata.xml new file mode 100644 index 0000000..f184262 --- /dev/null +++ b/com.redhat.Sdk.appdata.xml @@ -0,0 +1,19 @@ + + + com.redhat.Sdk + CC0 + https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel + Red Hat SDK + Tools and headers for developing applications + + + + +

+ The Red Hat Sdk is the development runtime that you can use to produce applications using + the Red Hat Platform runtime. It contains everything that is in the platform, as well + as build and debugging tools and headers for the libraries. +

+ + https://redhat.com/ + diff --git a/flatpak-runtime-config.spec b/flatpak-runtime-config.spec index 96b35ea..d142e8b 100644 --- a/flatpak-runtime-config.spec +++ b/flatpak-runtime-config.spec @@ -4,17 +4,15 @@ Name: flatpak-runtime-config Version: 40 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Configuration files that live inside the flatpak runtime Source1: 50-flatpak.conf Source2: sitecustomize.py Source3: defaults.json.in -Source4: org.fedoraproject.Platform.appdata.xml -Source5: org.fedoraproject.Sdk.appdata.xml -Source6: org.fedoraproject.KDE5Platform.appdata.xml -Source7: org.fedoraproject.KDE5Sdk.appdata.xml -Source8: org.fedoraproject.KDE6Platform.appdata.xml -Source9: org.fedoraproject.KDE6Sdk.appdata.xml +Source4: com.redhat.Platform.appdata.xml +Source5: com.redhat.Sdk.appdata.xml +Source6: org.centos.stream.Platform.appdata.xml +Source7: org.centos.stream.Sdk.appdata.xml Source10: 05-flatpak-fontpath.conf License: MIT @@ -50,12 +48,14 @@ done # Install appdata for both the Platform and the Sdk mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo +%if 0%{?rhel} install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE4} install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE5} +%endif +%if 0%{?centos} install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE6} install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE7} -install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE8} -install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE9} +%endif # Install flatpak-builder config file mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder @@ -110,6 +110,9 @@ done %{_sysconfdir}/ld.so.conf.d/app.conf %changelog +* Sat Jun 08 2024 Owen Taylor - 40-3 +- Adapt to centos-stream and RHEL for el10 + * Mon Jun 24 2024 Troy Dawson - 40-2 - Bump release for June 2024 mass rebuild diff --git a/org.centos.stream.Platform.appdata.xml b/org.centos.stream.Platform.appdata.xml new file mode 100644 index 0000000..373f530 --- /dev/null +++ b/org.centos.stream.Platform.appdata.xml @@ -0,0 +1,19 @@ + + + org.centos.stream.Platform + CC0-1.0 + https://www.centos.org/legal/licensing-policy/ + Centos Stream Platform + Shared libraries + + + + +

+ The Centos Stream 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. +

+ + https://www.centos.org/centos-stream/ + diff --git a/org.centos.stream.Sdk.appdata.xml b/org.centos.stream.Sdk.appdata.xml new file mode 100644 index 0000000..8967a34 --- /dev/null +++ b/org.centos.stream.Sdk.appdata.xml @@ -0,0 +1,19 @@ + + + org.centos.stream.Sdk + CC0-1.0 + https://www.centos.org/legal/licensing-policy/ + Centos Stream SDK + Tools and headers for developing applications + + + + +

+ The Centos Stream Sdk is the development runtime that you can use to produce applications + using the Centos Stream runtime. It contains everything that is in the platform, as well + as build and debugging tools and headers for the libraries. +

+ + https://www.centos.org/centos-stream/ + diff --git a/org.fedoraproject.KDE5Platform.appdata.xml b/org.fedoraproject.KDE5Platform.appdata.xml deleted file mode 100644 index 12aa886..0000000 --- a/org.fedoraproject.KDE5Platform.appdata.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - org.fedoraproject.KDE5Platform - CC0-1.0 - - GPL-2.0-or-later - Fedora KDE 5 Platform - Shared libraries - - - - - - - -

- The Fedora KDE 5 Platform is a runtime for Flatpak applications. - It contains common libraries that are shared between Qt and KDE 5 - applications. -

- - https://fedoraproject.org/ - diff --git a/org.fedoraproject.KDE5Sdk.appdata.xml b/org.fedoraproject.KDE5Sdk.appdata.xml deleted file mode 100644 index b693c99..0000000 --- a/org.fedoraproject.KDE5Sdk.appdata.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - org.fedoraproject.KDE5Sdk - CC0-1.0 - - GPL-2.0-or-later - Fedora KDE 5 SDK - Tools and headers for developing KDE 5 applications - - - - - - - -

- The Fedora KDE 5 Sdk is the development runtime that you can use to produce applications using - the Fedora KDE 5 Platform runtime. It contains everything that is in the platform, as well - as build and debugging tools and headers for the libraries. -

- - https://fedoraproject.org/ - diff --git a/org.fedoraproject.KDE6Platform.appdata.xml b/org.fedoraproject.KDE6Platform.appdata.xml deleted file mode 100644 index 298635a..0000000 --- a/org.fedoraproject.KDE6Platform.appdata.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - org.fedoraproject.KDE6Platform - CC0-1.0 - - GPL-2.0-or-later - Fedora KDE 6 Platform - Shared libraries - - - - - - - -

- The Fedora KDE 6 Platform is a runtime for Flatpak applications. - It contains common libraries that are shared between Qt and KDE 6 - applications. -

- - https://fedoraproject.org/ - diff --git a/org.fedoraproject.KDE6Sdk.appdata.xml b/org.fedoraproject.KDE6Sdk.appdata.xml deleted file mode 100644 index 58f617f..0000000 --- a/org.fedoraproject.KDE6Sdk.appdata.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - org.fedoraproject.KDE6Sdk - CC0-1.0 - - GPL-2.0-or-later - Fedora KDE 6 SDK - Tools and headers for developing KDE applications - - - - - - - -

- The Fedora KDE 6 Sdk is the development runtime that you can use to produce applications using - the Fedora KDE 6 Platform runtime. It contains everything that is in the platform, as well - as build and debugging tools and headers for the libraries. -

- - https://fedoraproject.org/ - diff --git a/org.fedoraproject.Platform.appdata.xml b/org.fedoraproject.Platform.appdata.xml deleted file mode 100644 index 15fafc7..0000000 --- a/org.fedoraproject.Platform.appdata.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - org.fedoraproject.Platform - CC0-1.0 - - GPL-2.0-or-later - Fedora Platform - Shared libraries - - - - - - - - - - - -

- 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. -

- - https://fedoraproject.org/ - diff --git a/org.fedoraproject.Sdk.appdata.xml b/org.fedoraproject.Sdk.appdata.xml deleted file mode 100644 index 2a6d8b1..0000000 --- a/org.fedoraproject.Sdk.appdata.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - org.fedoraproject.Sdk - CC0-1.0 - - GPL-2.0-or-later - Fedora SDK - Tools and headers for developing applications - - - - - - - - - - - -

- 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. -

- - https://fedoraproject.org/ -