Revert "Provide systemd packages"

This ended up causing weird issues with build dependencies, e.g. packages that 'BuildRequires: systemd' for systemd rpm macros no longer building because they ended up pulling in flatpak-runtime-config instead of systemd. This reverts commit ccc5a2ff39.
Add a seed for <dir prefix="xdg">fonts</dir>
2023-03-26 21:40:03 +02:00 · 2023-03-22 21:04:35 +09:00
11 changed files with 100 additions and 198 deletions
--- a/50-flatpak.conf
+++ b/50-flatpak.conf
@ -1,20 +1,17 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- This should be kept in sync with changes to
-     https://gitlab.com/freedesktop-sdk/freedesktop-sdk/blob/master/files/fontconfig/50-flatpak.conf
+     https://gitlab.com/freedesktop-sdk/freedesktop-sdk/blob/master/files/fontconfig-flatpak.conf
     from the Freedesktop runtimes. -->
 <fontconfig>
        <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>

        <dir>/run/host/fonts</dir>
-        <dir>/run/host/local-fonts</dir>
        <dir>/run/host/user-fonts</dir>

        <!-- This is duplicated from the general config because we want to write there
@ -25,6 +22,5 @@
        <cachedir>/run/host/fonts-cache</cachedir>
        <cachedir>/run/host/user-fonts-cache</cachedir>

-        <!-- This only exists when running flatpaks, not when building them in mock -->
-        <include ignore_missing="yes">/run/host/font-dirs.xml</include>
+        <include>/run/host/font-dirs.xml</include>
 </fontconfig>
--- a/128
+++ b/128
@ -1,128 +0,0 @@
-* Sun Feb 09 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 42-1
- Bump version
-
-* Tue Dec 10 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 41-2
- Enable dynamic ld.so.cache generation
-
-* Thu Aug 15 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 41-1
- Bump version
-
-* 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
-
-* Tue Feb 02 2021 Kalev Lember <klember@redhat.com> - 34-1
- Install flatpak-builder defaults.json config file
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 33-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* 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
-
-* Fri Mar 06 2020 Kalev Lember <klember@redhat.com> - 32-1
- Remove Python 2 support (#1801932)
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 30-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Aug  8 2019 fedora-toolbox <otaylor@redhat.com> - 30-2
- Fix comment location in fontconfig config file
-
-* Fri Jul 26 2019 Mark Otaris <mark@net-c.com> - 30-1
- Update font config to match freedesktop-sdk, allowing user-installed fonts to work
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 29-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 29-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Sep 28 2018 Owen Taylor <otaylor@redhat.com> - 29-4
- Add a usercustomize.py to set up Python paths
-
-* Sat Sep  8 2018 Owen Taylor <otaylor@redhat.com> - 29-3
- Fix path to gsettings schemas in trigger
-
-* Sat Sep  8 2018 Owen Taylor <otaylor@redhat.com> - 29-2
- Avoid comments leaking into scriplets
-
-* Sat Sep  8 2018 Owen Taylor <otaylor@redhat.com> - 29-1
- Add file triggers from glibc, glib2, and fontconfig
-
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 27-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 27-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 27-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Jun 29 2017 Owen Taylor <otaylor@redhat.com> - 27-3
- Make not noarch - the contents of /etc/ld.so.conf.d/app.conf
-  depend on 64-bit vs. 32-bit
- Rename fontconfig conf file from 'xdg-app' to 'flatpak'
-
-* Tue Jun 13 2017 Owen Taylor <otaylor@redhat.com> - 27-2
-See https://bugzilla.redhat.com/show_bug.cgi?id=1460081
- Switch license to MIT
- Preserve timestamps on file installation
- Own /usr/cache since it's not a standard directory
- Require fontpackages-filesystem for /etc/fonts/conf.d
-
-* Wed Jun  7 2017 Owen Taylor <otaylor@redhat.com> - 27-1
- Strip down to just config files
-
-* Wed Jun  3 2015 Alexander Larsson <alexl@redhat.com>
- Initial version
--- a/defaults.json.in
+++ b/defaults.json.in
@ -3,5 +3,5 @@
  "cflags": "%{build_cflags}",
  "cxxflags": "%{build_cxxflags}",
  "cppflags": "",
-  "ldflags": "-L/app/lib %{build_ldflags}"
+  "ldflags": "-L/app/%{_lib} %{build_ldflags}"
 }
--- a/flatpak-runtime-config.spec
+++ b/flatpak-runtime-config.spec
@ -3,11 +3,11 @@
 %undefine _package_note_flags

 Name:           flatpak-runtime-config
-Version:        42
-Release:        %autorelease
+Version:        37
+Release:        4%{?dist}
 Summary:        Configuration files that live inside the flatpak runtime
 Source1:        50-flatpak.conf
-Source2:        sitecustomize.py
+Source2:        usercustomize.py
 Source3:        defaults.json.in
 Source4:        org.fedoraproject.Platform.appdata.xml
 Source5:        org.fedoraproject.Sdk.appdata.xml
@ -22,7 +22,6 @@ License:        MIT
 BuildRequires:  python3
 BuildRequires:  python3-rpm-macros

-Requires:       findutils
 Requires:       fontpackages-filesystem

 %description
@ -67,16 +66,7 @@ sed -e 's|%%{_libdir}|%{_libdir}|' \
    %{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder/defaults.json

 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/app.conf <<_EOF
-include /run/flatpak/ld.so.conf.d/app-*.conf
-include /app/etc/ld.so.conf
-include /app/etc/ld.so.conf.d/*.conf
-/app/%{_lib}
-%if "%{_lib}" != "lib"
-/app/lib
-%endif
-include /run/flatpak/ld.so.conf.d/runtime-*.conf
-_EOF
+echo "/app/%{_lib}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/app.conf

 # We duplicate selected file triggers from packages in the runtime, to
 # extend them to cover /app as well. Some other functions that RPM file
@ -91,32 +81,15 @@ _EOF

 %post -p /sbin/ldconfig

-%transfiletriggerin -P 1999999 -- /app/lib /app/lib64 /app/etc/ld.so.conf.d
+%transfiletriggerin -P 1999999 -- /app/lib /app/lib64
 /sbin/ldconfig

-%transfiletriggerin -P 99999 -- /app/%{_lib}/gdk-pixbuf-2.0/2.10.0/loaders /usr/%{_lib}/gdk-pixbuf-2.0/2.10.0/loaders
-gdk-pixbuf-query-loaders-%{__isa_bits} > /usr/%{_lib}/gdk-pixbuf-2.0/2.10.0/loaders.cache
-if [ -d /app/%{_lib}/gdk-pixbuf-2.0/2.10.0/loaders ]; then
-    GDK_PIXBUF_MODULEDIR=/app/%{_lib}/gdk-pixbuf-2.0/2.10.0/loaders/ \
-        gdk-pixbuf-query-loaders-%{__isa_bits} >> /usr/%{_lib}/gdk-pixbuf-2.0/2.10.0/loaders.cache
-    cp /usr/%{_lib}/gdk-pixbuf-2.0/2.10.0/loaders.cache /app/%{_lib}/gdk-pixbuf-2.0/2.10.0/loaders.cache
-fi
-
 %transfiletriggerin -- /app/share/glib-2.0/schemas
 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
@ -127,4 +100,95 @@ done
 %{_sysconfdir}/ld.so.conf.d/app.conf

 %changelog
-%autochangelog
+* 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
+
+* Tue Feb 02 2021 Kalev Lember <klember@redhat.com> - 34-1
+- Install flatpak-builder defaults.json config file
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 33-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* 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
+
+* Fri Mar 06 2020 Kalev Lember <klember@redhat.com> - 32-1
+- Remove Python 2 support (#1801932)
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 30-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Aug  8 2019 fedora-toolbox <otaylor@redhat.com> - 30-2
+- Fix comment location in fontconfig config file
+
+* Fri Jul 26 2019 Mark Otaris <mark@net-c.com> - 30-1
+- Update font config to match freedesktop-sdk, allowing user-installed fonts to work
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 29-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 29-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Sep 28 2018 Owen Taylor <otaylor@redhat.com> - 29-4
+- Add a usercustomize.py to set up Python paths
+
+* Sat Sep  8 2018 Owen Taylor <otaylor@redhat.com> - 29-3
+- Fix path to gsettings schemas in trigger
+
+* Sat Sep  8 2018 Owen Taylor <otaylor@redhat.com> - 29-2
+- Avoid comments leaking into scriplets
+
+* Sat Sep  8 2018 Owen Taylor <otaylor@redhat.com> - 29-1
+- Add file triggers from glibc, glib2, and fontconfig
+
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 27-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 27-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 27-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jun 29 2017 Owen Taylor <otaylor@redhat.com> - 27-3
+- Make not noarch - the contents of /etc/ld.so.conf.d/app.conf
+  depend on 64-bit vs. 32-bit
+- Rename fontconfig conf file from 'xdg-app' to 'flatpak'
+
+* Tue Jun 13 2017 Owen Taylor <otaylor@redhat.com> - 27-2
+See https://bugzilla.redhat.com/show_bug.cgi?id=1460081
+- Switch license to MIT
+- Preserve timestamps on file installation
+- Own /usr/cache since it's not a standard directory
+- Require fontpackages-filesystem for /etc/fonts/conf.d
+
+* Wed Jun  7 2017 Owen Taylor <otaylor@redhat.com> - 27-1
+- Strip down to just config files
+
+* Wed Jun  3 2015 Alexander Larsson <alexl@redhat.com>
+- Initial version
--- a/org.fedoraproject.KDE5Platform.appdata.xml
+++ b/org.fedoraproject.KDE5Platform.appdata.xml
@ -7,11 +7,6 @@
  <name>Fedora KDE 5 Platform</name>
  <summary>Shared libraries</summary>
  <releases>
-    <release version="42" date="2025-04-15"/>
-    <release version="41" date="2024-10-22"/>
-    <release version="40" date="2024-04-03"/>
-    <release version="39" date="2023-10-06"/>
-    <release version="38" date="2023-03-18"/>
    <release version="37" date="2023-02-07"/>
  </releases>
  <description>
--- a/org.fedoraproject.KDE5Sdk.appdata.xml
+++ b/org.fedoraproject.KDE5Sdk.appdata.xml
@ -7,11 +7,6 @@
  <name>Fedora KDE 5 SDK</name>
  <summary>Tools and headers for developing KDE 5 applications</summary>
  <releases>
-    <release version="42" date="2025-04-15"/>
-    <release version="41" date="2024-10-22"/>
-    <release version="40" date="2024-04-03"/>
-    <release version="39" date="2023-10-06"/>
-    <release version="38" date="2023-03-18"/>
    <release version="37" date="2023-02-07"/>
  </releases>
  <description>
--- a/org.fedoraproject.KDE6Platform.appdata.xml
+++ b/org.fedoraproject.KDE6Platform.appdata.xml
@ -7,11 +7,6 @@
  <name>Fedora KDE 6 Platform</name>
  <summary>Shared libraries</summary>
  <releases>
-    <release version="42" date="2025-04-15"/>
-    <release version="41" date="2024-10-22"/>
-    <release version="40" date="2024-04-03"/>
-    <release version="39" date="2023-10-06"/>
-    <release version="38" date="2023-03-18"/>
    <release version="37" date="2023-02-07"/>
  </releases>
  <description>
--- a/org.fedoraproject.KDE6Sdk.appdata.xml
+++ b/org.fedoraproject.KDE6Sdk.appdata.xml
@ -7,11 +7,6 @@
  <name>Fedora KDE 6 SDK</name>
  <summary>Tools and headers for developing KDE applications</summary>
  <releases>
-    <release version="42" date="2025-04-15"/>
-    <release version="41" date="2024-10-22"/>
-    <release version="40" date="2024-04-03"/>
-    <release version="39" date="2023-10-06"/>
-    <release version="38" date="2023-03-18"/>
    <release version="37" date="2023-02-07"/>
  </releases>
  <description>
--- a/org.fedoraproject.Platform.appdata.xml
+++ b/org.fedoraproject.Platform.appdata.xml
@ -7,11 +7,6 @@
  <name>Fedora Platform</name>
  <summary>Shared libraries</summary>
  <releases>
-    <release version="42" date="2025-04-15"/>
-    <release version="41" date="2024-10-22"/>
-    <release version="40" date="2024-04-03"/>
-    <release version="39" date="2023-10-06"/>
-    <release version="38" date="2023-03-18"/>
    <release version="37" date="2022-08-17"/>
    <release version="36" date="2022-05-03"/>
    <release version="35" date="2021-10-01"/>
--- a/org.fedoraproject.Sdk.appdata.xml
+++ b/org.fedoraproject.Sdk.appdata.xml
@ -7,11 +7,6 @@
  <name>Fedora SDK</name>
  <summary>Tools and headers for developing applications</summary>
  <releases>
-    <release version="42" date="2025-04-15"/>
-    <release version="41" date="2024-10-22"/>
-    <release version="40" date="2024-04-03"/>
-    <release version="39" date="2023-10-06"/>
-    <release version="38" date="2023-03-18"/>
    <release version="37" date="2022-08-17"/>
    <release version="36" date="2022-05-03"/>
    <release version="35" date="2021-10-01"/>
--- a/usercustomize.py
+++ b/usercustomize.py