7 changed files with 21 additions and 132 deletions
--- a/50-flatpak.conf
+++ b/50-flatpak.conf
@ -7,8 +7,6 @@
        <cachedir>/usr/cache/fontconfig</cachedir>

        <dir>/app/share/fonts</dir>
-        <dir>/app/share/X11/fonts/Type1</dir>
-        <dir>/app/share/X11/fonts/TTF</dir>
        <cachedir>/app/cache/fontconfig</cachedir>

        <include ignore_missing="yes">/app/etc/fonts/local.conf</include>
--- a/com.redhat.Platform.appdata.xml
+++ b/com.redhat.Platform.appdata.xml
@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="runtime">
  <id>com.redhat.Platform</id>
-  <metadata_license>CC0-1.0</metadata_license>
+  <metadata_license>CC0</metadata_license>
  <project_license>https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel</project_license>
  <name>Red Hat Platform</name>
  <summary>Shared libraries</summary>
  <releases>
-    <release version="10" date="2023-06-29"/>
    <release version="9" date="2021-06-29"/>
  </releases>
  <description>
--- a/flatpak-runtime-config.spec
+++ b/flatpak-runtime-config.spec
@ -1,26 +1,19 @@
-# package notes require setting RPM-specific environment variables,
-# incompatible with flatpak-builder
-%undefine _package_note_flags
-
 Name:           flatpak-runtime-config
-Version:        40
-Release:        4%{?dist}
+Version:        34
+Release:        3%{?dist}
 Summary:        Configuration files that live inside the flatpak runtime
 Source1:        50-flatpak.conf
-Source2:        sitecustomize.py
-Source3:        defaults.json.in
-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
+Source2:        usercustomize.py
+Source3:        com.redhat.Platform.appdata.xml
+Source4:        com.redhat.Sdk.appdata.xml
+Source5:        defaults.json.in
+Source6:        05-flatpak-fontpath.conf

 License:        MIT

 BuildRequires:  python3
 BuildRequires:  python3-rpm-macros

-Requires:       findutils
 Requires:       fontpackages-filesystem

 %description
@ -38,7 +31,7 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/cache/fontconfig
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 install -t $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -p -m 0644 %{SOURCE1}
-install -t $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -p -m 0644 %{SOURCE10}
+install -t $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -p -m 0644 %{SOURCE6}

 # usercustomize.py to set up Python paths
 for d in %{python3_sitelib} ; do
@ -48,14 +41,8 @@ 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 %{SOURCE3}
 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}
-%endif

 # Install flatpak-builder config file
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder
@ -64,7 +51,7 @@ sed -e 's|%%{_libdir}|%{_libdir}|' \
    -e 's|%%{build_cflags}|%{build_cflags}|' \
    -e 's|%%{build_cxxflags}|%{build_cxxflags}|' \
    -e 's|%%{build_ldflags}|%{build_ldflags}|' \
-    %{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder/defaults.json
+    %{SOURCE5} > $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
@ -91,15 +78,6 @@ glib-compile-schemas /app/share/glib-2.0/schemas &> /dev/null || :
 %transfiletriggerin -- /app/share/fonts
 HOME=/root /usr/bin/fc-cache -s

-%transfiletriggerin -- /app/share/java
-for d in `find /app/share/java -type d`; do mkdir -p /usr${d#/app}; done
-for f in `find /app/share/java ! -type d`; do ln -s $f /usr${f#/app}; done
-
-%transfiletriggerin -P 1 -- /app
-for l in `find /app -type l`; do \
-  case `readlink $l` in /etc/alternatives/*) ln -fns `readlink -f $l` $l ;; esac \
-done
-
 %files
 %dir %{_prefix}/cache
 %dir %{_prefix}/cache/fontconfig
@ -110,64 +88,16 @@ done
 %{_sysconfdir}/ld.so.conf.d/app.conf

 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 40-4
- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
+* Fri Mar 24 2023 Tomas Popela <tpopela@redhat.com> - 34-3
+- Sync with Fedora
+- Add a seed for <dir prefix="xdg">fonts</dir> (by tagoh)

-* Sat Jun 08 2024 Owen Taylor <otaylor@redhat.com> - 40-3
- Adapt to centos-stream and RHEL for el10
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 40-2
- Bump release for June 2024 mass rebuild
-
-* Wed Apr 03 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 40-1
- Bump version
-
-* Fri Mar 01 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 39-6
- Add Java symlink trigger
- Add /app-built X11 font directories to fontconfig path
- Add alternatives symlink trigger
-
-* Fri Dec 15 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 39-5
- Add graphviz install trigger
-
-* Thu Oct 05 2023 Kalev Lember <klember@redhat.com> - 39-4
- appdata: Add F39 versions
-
-* Mon Sep 04 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 39-3
- Provide sitecustomize instead of usercustomize
-
-* Tue Aug 22 2023 Owen Taylor <otaylor@redhat.com> - 39-2
- Bump for rebuild
-
-* Mon Aug 7 2023 Owen Taylor <otaylor@redhat.com> - 39-1
- Bump version
-
-* Sat Mar 18 2023 Kalev Lember <klember@redhat.com> - 38-1
- appdata: Add F38 versions
- Revert "Provide systemd packages"
-
-* 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
-
-* Tue Sep 06 2022 Kalev Lember <klember@redhat.com> - 37-2
- Correctly substitute /app/lib in flatpak-builder defaults.json ldflags
- Revert "Fix search paths for /app-installed python modules" (#2026979)
-
-* Wed Aug 17 2022 Kalev Lember <klember@redhat.com> - 37-1
- appdata: Add F37 versions
-
-* Thu Aug 04 2022 Kalev Lember <klember@redhat.com> - 36-2
- Fix search paths for /app-installed python modules (#2112499)
-
-* Mon May 02 2022 Tomas Popela <tpopela@redhat.com> - 36-1
- appdata: Add F36 versions
-
-* Thu Sep 30 2021 Kalev Lember <klember@redhat.com> - 35-1
- appdata: Add F35 versions
+* Fri Mar 17 2023 Tomas Popela <tpopela@redhat.com> - 34-2
+- Sync with Fedora
+- Correctly substitute /app/lib in flatpak-builder defaults.json ldflags (by klember)
+- Include fonts-dirs.xml in fontconfig flatpak configuration (by tagoh)
+- Add 05-flatpak-fontpath.conf that forces a different MD5 for fontconfig cache to avoid
+  conflict between caches on host and flatpak (by tagoh)

 * Tue Feb 02 2021 Kalev Lember <klember@redhat.com> - 34-1
 - Install flatpak-builder defaults.json config file
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-10
+  - rhel-9
 decision_context: osci_compose_gate
 rules:
  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
--- a/org.centos.stream.Platform.appdata.xml
+++ b/org.centos.stream.Platform.appdata.xml
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="runtime">
-  <id>org.centos.stream.Platform</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>https://www.centos.org/legal/licensing-policy/</project_license>
-  <name>Centos Stream Platform</name>
-  <summary>Shared libraries</summary>
-  <releases>
-    <release version="10" date="2024-06-08"/>
-  </releases>
-  <description>
-    <p>
-      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.
-    </p>
-  </description>
-  <url type="homepage">https://www.centos.org/centos-stream/</url>
-</component>
--- a/org.centos.stream.Sdk.appdata.xml
+++ b/org.centos.stream.Sdk.appdata.xml
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="runtime">
-  <id>org.centos.stream.Sdk</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>https://www.centos.org/legal/licensing-policy/</project_license>
-  <name>Centos Stream SDK</name>
-  <summary>Tools and headers for developing applications</summary>
-  <releases>
-    <release version="10" date="2024-06-08"/>
-  </releases>
-  <description>
-    <p>
-      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.
-    </p>
-  </description>
-  <url type="homepage">https://www.centos.org/centos-stream/</url>
-</component>
--- a/usercustomize.py
+++ b/usercustomize.py