Add Suggests from fedora-release-flatpak

Suggests: fedora-release-flatpak
Suggests: fedora-release-identity-flatpak
2025-10-26 16:20:10 -04:00 · 2025-10-23 22:44:15 -04:00 · 2025-10-23 21:41:31 -04:00 · 2025-10-10 12:37:40 -04:00 · 2025-10-06 11:57:22 -04:00 · 2025-09-30 19:41:49 -04:00
8 changed files with 32 additions and 5 deletions
--- a/app.sh
+++ b/app.sh
@ -0,0 +1 @@
+export PATH=/app/bin:$PATH
--- a/flatpak-runtime-config.spec
+++ b/flatpak-runtime-config.spec
@ -3,7 +3,7 @@
 %undefine _package_note_flags

 Name:           flatpak-runtime-config
-Version:        42
+Version:        43
 Release:        %autorelease
 Summary:        Configuration files that live inside the flatpak runtime
 Source1:        50-flatpak.conf
@ -16,6 +16,7 @@ Source7:        org.fedoraproject.KDE5Sdk.appdata.xml
 Source8:        org.fedoraproject.KDE6Platform.appdata.xml
 Source9:        org.fedoraproject.KDE6Sdk.appdata.xml
 Source10:       05-flatpak-fontpath.conf
+Source11:       app.sh

 License:        MIT

@ -25,6 +26,21 @@ BuildRequires:  python3-rpm-macros
 Requires:       findutils
 Requires:       fontpackages-filesystem

+%if 0%{?fedora}
+# Assure the correct identity is always used
+Suggests:       fedora-release-flatpak
+# gnuplot requires qt6, gnuplot-wx requires gtk3 (available in all runtimes)
+Suggests:       (gnuplot if qt6-qtbase else gnuplot-wx)
+# Default version of java, java-devel, java-headless, etc.
+Suggests:       java-25-openjdk
+Suggests:       java-25-openjdk-devel
+Suggests:       java-25-openjdk-headless
+# default backend included in runtime
+Suggests:       qt6-qtspeech-speechd
+# Prefer over wget1-wget for webclient
+Suggests:       wget2-wget
+%endif
+
 %description
 This package includes configuration files that are installed into the flatpak
 runtime filesystem during the runtime creation process; it is also installed
@ -42,6 +58,9 @@ 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}

+# profile.d to set up command paths
+install -D -t $RPM_BUILD_ROOT%{_sysconfdir}/profile.d -p -m 0644 %{SOURCE11}
+
 # usercustomize.py to set up Python paths
 for d in %{python3_sitelib} ; do
    mkdir -p $RPM_BUILD_ROOT/$d
@ -89,10 +108,10 @@ _EOF
 # and this will make sure it is created install time, as it would be
 # system-wide.

-%post -p /sbin/ldconfig
+%post -p /usr/bin/ldconfig

-%transfiletriggerin -P 1999999 -- /app/lib /app/lib64 /app/etc/ld.so.conf.d
-/sbin/ldconfig
+%filetriggerin -P 1999999 -- /app/lib /app/lib64 /app/etc/ld.so.conf.d
+/usr/bin/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
@ -106,7 +125,7 @@ fi
 glib-compile-schemas /app/share/glib-2.0/schemas &> /dev/null || :

 %transfiletriggerin -- /app/share/fonts
-HOME=/root /usr/bin/fc-cache -s
+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
@ -125,6 +144,7 @@ done
 %{_sysconfdir}/flatpak-builder/
 %{_sysconfdir}/fonts/conf.d/*
 %{_sysconfdir}/ld.so.conf.d/app.conf
+%{_sysconfdir}/profile.d/app.sh

 %changelog
 %autochangelog
--- a/org.fedoraproject.KDE5Platform.appdata.xml
+++ b/org.fedoraproject.KDE5Platform.appdata.xml
@ -7,6 +7,7 @@
  <name>Fedora KDE 5 Platform</name>
  <summary>Shared libraries</summary>
  <releases>
+    <release version="43" date="2025-10-21"/>
    <release version="42" date="2025-04-15"/>
    <release version="41" date="2024-10-22"/>
    <release version="40" date="2024-04-03"/>
--- a/org.fedoraproject.KDE5Sdk.appdata.xml
+++ b/org.fedoraproject.KDE5Sdk.appdata.xml
@ -7,6 +7,7 @@
  <name>Fedora KDE 5 SDK</name>
  <summary>Tools and headers for developing KDE 5 applications</summary>
  <releases>
+    <release version="43" date="2025-10-21"/>
    <release version="42" date="2025-04-15"/>
    <release version="41" date="2024-10-22"/>
    <release version="40" date="2024-04-03"/>
--- a/org.fedoraproject.KDE6Platform.appdata.xml
+++ b/org.fedoraproject.KDE6Platform.appdata.xml
@ -7,6 +7,7 @@
  <name>Fedora KDE 6 Platform</name>
  <summary>Shared libraries</summary>
  <releases>
+    <release version="43" date="2025-10-21"/>
    <release version="42" date="2025-04-15"/>
    <release version="41" date="2024-10-22"/>
    <release version="40" date="2024-04-03"/>
--- a/org.fedoraproject.KDE6Sdk.appdata.xml
+++ b/org.fedoraproject.KDE6Sdk.appdata.xml
@ -7,6 +7,7 @@
  <name>Fedora KDE 6 SDK</name>
  <summary>Tools and headers for developing KDE applications</summary>
  <releases>
+    <release version="43" date="2025-10-21"/>
    <release version="42" date="2025-04-15"/>
    <release version="41" date="2024-10-22"/>
    <release version="40" date="2024-04-03"/>
--- a/org.fedoraproject.Platform.appdata.xml
+++ b/org.fedoraproject.Platform.appdata.xml
@ -7,6 +7,7 @@
  <name>Fedora Platform</name>
  <summary>Shared libraries</summary>
  <releases>
+    <release version="43" date="2025-10-21"/>
    <release version="42" date="2025-04-15"/>
    <release version="41" date="2024-10-22"/>
    <release version="40" date="2024-04-03"/>
--- a/org.fedoraproject.Sdk.appdata.xml
+++ b/org.fedoraproject.Sdk.appdata.xml
@ -7,6 +7,7 @@
  <name>Fedora SDK</name>
  <summary>Tools and headers for developing applications</summary>
  <releases>
+    <release version="43" date="2025-10-21"/>
    <release version="42" date="2025-04-15"/>
    <release version="41" date="2024-10-22"/>
    <release version="40" date="2024-04-03"/>
Author	SHA1	Message	Date
Yaakov Selkowitz	f0a0bc91a1	Add Suggests from fedora-release-flatpak	2025-10-26 16:20:10 -04:00
Yaakov Selkowitz	2ce6890ced	Suggests: fedora-release-flatpak	2025-10-23 22:44:15 -04:00
Yaakov Selkowitz	5190229cf1	Suggests: fedora-release-identity-flatpak Whether this is being installed into a runtime or app, we want to prefer the flatpak identity in Fedora.	2025-10-23 21:41:31 -04:00
Yaakov Selkowitz	cd0c283e09	Switch ldconfig scriptlet to %filetriggerin A library installed in /app needs to be cached as soon as it is installed, in case any %post scriptlets run binaries dependent on libraries from the package itself or other libraries in /app, in which case it would fail. While errors in %post used to be handled as non-critical, as of RPM 6.0 (Fedora 43), these cause the installation to fail.	2025-10-10 12:37:40 -04:00
Yaakov Selkowitz	e755a3fb26	Do not require fontconfig rpm 6.0 errors out with "non-critical" errors in scriptlets. While generally fontconfig will be present when fonts are installed, that is not always true (e.g. fonts for use by python-sphinx documentation generation).	2025-10-06 11:57:22 -04:00
Yaakov Selkowitz	ed50a6d087	export PATH	2025-09-30 19:41:49 -04:00
Yaakov Selkowitz	081f9e9f03	Fix ldconfig path	2025-09-28 14:13:56 -04:00
Yaakov Selkowitz	07e19e9fe9	Add profile.d snippet to set PATH	2025-09-28 13:21:26 -04:00
Yaakov Selkowitz	9d1ad8396d	Bump version	2025-09-07 14:56:21 -04:00