#5 Add metainfo for KDE runtimes
Merged a year ago by kalev. Opened a year ago by yselkowitz.
rpms/ yselkowitz/flatpak-runtime-config kde  into  f37

file modified
+17 -6
@@ -4,13 +4,17 @@ 

  

  Name:           flatpak-runtime-config

  Version:        37

- Release:        3%{?dist}

+ Release:        4%{?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

- Source5:        defaults.json.in

+ 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

  

  License:        MIT

  
@@ -43,8 +47,12 @@ 

  

  # 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}

+ install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE5}

+ 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}

  

  # Install flatpak-builder config file

  mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder
@@ -53,7 +61,7 @@ 

      -e 's|%%{build_cflags}|%{build_cflags}|' \

      -e 's|%%{build_cxxflags}|%{build_cxxflags}|' \

      -e 's|%%{build_ldflags}|%{build_ldflags}|' \

-     %{SOURCE5} > $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder/defaults.json

+     %{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder/defaults.json

  

  mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/

  echo "/app/%{_lib}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/app.conf
@@ -90,6 +98,9 @@ 

  %{_sysconfdir}/ld.so.conf.d/app.conf

  

  %changelog

+ * Tue Feb 21 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 37-4

+ - Add metainfo for KDE runtimes

+ 

  * Tue Feb 21 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 37-3

  - Remove package notes from flatpak-builder compile flags

  

@@ -0,0 +1,20 @@ 

+ <?xml version="1.0" encoding="UTF-8"?>

+ <component type="runtime">

+   <id>org.fedoraproject.KDE5Platform</id>

+   <metadata_license>CC0-1.0</metadata_license>

+   <!-- FIXME -->

+   <project_license>GPL-2.0-or-later</project_license>

+   <name>Fedora KDE 5 Platform</name>

+   <summary>Shared libraries</summary>

+   <releases>

+     <release version="37" date="2023-02-07"/>

+   </releases>

+   <description>

+     <p>

+        The Fedora KDE 5 Platform is a runtime for Flatpak applications.

+        It contains common libraries that are shared between Qt and KDE 5

+        applications.

+     </p>

+   </description>

+   <url type="homepage">https://fedoraproject.org/</url>

+ </component>

@@ -0,0 +1,20 @@ 

+ <?xml version="1.0" encoding="UTF-8"?>

+ <component type="runtime">

+   <id>org.fedoraproject.KDE5Sdk</id>

+   <metadata_license>CC0-1.0</metadata_license>

+   <!-- FIXME -->

+   <project_license>GPL-2.0-or-later</project_license>

+   <name>Fedora KDE 5 SDK</name>

+   <summary>Tools and headers for developing KDE 5 applications</summary>

+   <releases>

+     <release version="37" date="2023-02-07"/>

+   </releases>

+   <description>

+     <p>

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

+     </p>

+   </description>

+   <url type="homepage">https://fedoraproject.org/</url>

+ </component>

@@ -0,0 +1,20 @@ 

+ <?xml version="1.0" encoding="UTF-8"?>

+ <component type="runtime">

+   <id>org.fedoraproject.KDE6Platform</id>

+   <metadata_license>CC0-1.0</metadata_license>

+   <!-- FIXME -->

+   <project_license>GPL-2.0-or-later</project_license>

+   <name>Fedora KDE 6 Platform</name>

+   <summary>Shared libraries</summary>

+   <releases>

+     <release version="37" date="2023-02-07"/>

+   </releases>

+   <description>

+     <p>

+        The Fedora KDE 6 Platform is a runtime for Flatpak applications.

+        It contains common libraries that are shared between Qt and KDE 6

+        applications.

+     </p>

+   </description>

+   <url type="homepage">https://fedoraproject.org/</url>

+ </component>

@@ -0,0 +1,20 @@ 

+ <?xml version="1.0" encoding="UTF-8"?>

+ <component type="runtime">

+   <id>org.fedoraproject.KDE6Sdk</id>

+   <metadata_license>CC0-1.0</metadata_license>

+   <!-- FIXME -->

+   <project_license>GPL-2.0-or-later</project_license>

+   <name>Fedora KDE 6 SDK</name>

+   <summary>Tools and headers for developing KDE applications</summary>

+   <releases>

+     <release version="37" date="2023-02-07"/>

+   </releases>

+   <description>

+     <p>

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

+     </p>

+   </description>

+   <url type="homepage">https://fedoraproject.org/</url>

+ </component>

@@ -1,9 +1,9 @@ 

  <?xml version="1.0" encoding="UTF-8"?>

  <component type="runtime">

    <id>org.fedoraproject.Platform</id>

-   <metadata_license>CC0</metadata_license>

+   <metadata_license>CC0-1.0</metadata_license>

    <!-- FIXME -->

-   <project_license>GPL-2.0+</project_license>

+   <project_license>GPL-2.0-or-later</project_license>

    <name>Fedora Platform</name>

    <summary>Shared libraries</summary>

    <releases>

@@ -1,9 +1,9 @@ 

  <?xml version="1.0" encoding="UTF-8"?>

  <component type="runtime">

    <id>org.fedoraproject.Sdk</id>

-   <metadata_license>CC0</metadata_license>

+   <metadata_license>CC0-1.0</metadata_license>

    <!-- FIXME -->

-   <project_license>GPL-2.0+</project_license>

+   <project_license>GPL-2.0-or-later</project_license>

    <name>Fedora SDK</name>

    <summary>Tools and headers for developing applications</summary>

    <releases>

This is not a valid identifier for AppStream, as they use SPDX. It needs to be CC0-1.0.

This is technically not supposed to be used in Fedora SPDX, and instead needs to be GPL-2.0-or-later.

This is not a valid identifier for AppStream, as they use SPDX. It needs to be CC0-1.0.
This is technically not supposed to be used in Fedora SPDX, and instead needs to be GPL-2.0-or-later.

These were copied straight from the existing appdata files. @kalev should these be changed?

KDE 5 -> KDE Plasma 5
KDE 6 -> KDE Plasma 6

Isn't Plasma the desktop, while this is talking about applications?

KDE Plasma is the platform, there is Plasma Desktop, Plasma Mobile, Plasma BigScreen, etc.

Actually, I guess I'm wrong? Apparently the brand doc says to call it KDE Platform 🤷

This is not a valid identifier for AppStream, as they use SPDX. It needs to be CC0-1.0.
This is technically not supposed to be used in Fedora SPDX, and instead needs to be GPL-2.0-or-later.

These were copied straight from the existing appdata files. @kalev should these be changed?

Sure, fine with me. These expressions here all predate the SPDX use in Fedora spec files.

rebased onto b067be5

a year ago

rebased onto 44e2d97

a year ago

Fixed the licensing and tried to improve the wording of the new appdata.

Looks good to me! Do you have any more comments, Neal?

LGTM, let's gooooo! :100:

Pull-Request has been merged by kalev

a year ago