diff --git a/app.sh b/app.sh new file mode 100644 index 0000000..5aae98f --- /dev/null +++ b/app.sh @@ -0,0 +1 @@ +export PATH=/app/bin:$PATH diff --git a/flatpak-runtime-config.spec b/flatpak-runtime-config.spec index 5a4e9ee..d94e136 100644 --- 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 diff --git a/org.fedoraproject.KDE5Platform.appdata.xml b/org.fedoraproject.KDE5Platform.appdata.xml index d633df8..bd4d3ff 100644 --- a/org.fedoraproject.KDE5Platform.appdata.xml +++ b/org.fedoraproject.KDE5Platform.appdata.xml @@ -7,6 +7,7 @@ Fedora KDE 5 Platform Shared libraries + diff --git a/org.fedoraproject.KDE5Sdk.appdata.xml b/org.fedoraproject.KDE5Sdk.appdata.xml index cb2886c..c3672aa 100644 --- a/org.fedoraproject.KDE5Sdk.appdata.xml +++ b/org.fedoraproject.KDE5Sdk.appdata.xml @@ -7,6 +7,7 @@ Fedora KDE 5 SDK Tools and headers for developing KDE 5 applications + diff --git a/org.fedoraproject.KDE6Platform.appdata.xml b/org.fedoraproject.KDE6Platform.appdata.xml index e7dd248..0e1e15c 100644 --- a/org.fedoraproject.KDE6Platform.appdata.xml +++ b/org.fedoraproject.KDE6Platform.appdata.xml @@ -7,6 +7,7 @@ Fedora KDE 6 Platform Shared libraries + diff --git a/org.fedoraproject.KDE6Sdk.appdata.xml b/org.fedoraproject.KDE6Sdk.appdata.xml index 5262c79..7968545 100644 --- a/org.fedoraproject.KDE6Sdk.appdata.xml +++ b/org.fedoraproject.KDE6Sdk.appdata.xml @@ -7,6 +7,7 @@ Fedora KDE 6 SDK Tools and headers for developing KDE applications + diff --git a/org.fedoraproject.Platform.appdata.xml b/org.fedoraproject.Platform.appdata.xml index d469f45..480ddcb 100644 --- a/org.fedoraproject.Platform.appdata.xml +++ b/org.fedoraproject.Platform.appdata.xml @@ -7,6 +7,7 @@ Fedora Platform Shared libraries + diff --git a/org.fedoraproject.Sdk.appdata.xml b/org.fedoraproject.Sdk.appdata.xml index 13c4fac..1c1872d 100644 --- a/org.fedoraproject.Sdk.appdata.xml +++ b/org.fedoraproject.Sdk.appdata.xml @@ -7,6 +7,7 @@ Fedora SDK Tools and headers for developing applications +