diff --git a/defaults.json.in b/defaults.json.in new file mode 100644 index 0000000..709d182 --- /dev/null +++ b/defaults.json.in @@ -0,0 +1,7 @@ +{ + "libdir": "%{_libdir}", + "cflags": "%{build_cflags}", + "cxxflags": "%{build_cxxflags}", + "cppflags": "", + "ldflags": "-L/app/lib %{build_ldflags}" +} diff --git a/flatpak-runtime-config.spec b/flatpak-runtime-config.spec index a795c8a..0ae25ad 100644 --- a/flatpak-runtime-config.spec +++ b/flatpak-runtime-config.spec @@ -1,11 +1,12 @@ Name: flatpak-runtime-config Version: 33 -Release: 1%{?dist} +Release: 2%{?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 License: MIT @@ -41,6 +42,14 @@ 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 flatpak-builder config file +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder +sed -e 's|%%{_libdir}|%{_libdir}|' \ + -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 + mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ echo "/app/%{_lib}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/app.conf @@ -71,10 +80,14 @@ HOME=/root /usr/bin/fc-cache -s %dir %{_prefix}/cache/fontconfig %{python3_sitelib} %{_datadir}/metainfo/*.appdata.xml +%{_sysconfdir}/flatpak-builder/ %{_sysconfdir}/fonts/conf.d/* %{_sysconfdir}/ld.so.conf.d/app.conf %changelog +* Tue Feb 02 2021 Kalev Lember - 33-2 +- Install flatpak-builder defaults.json config file + * Wed Jul 29 2020 Kalev Lember - 33-1 - Install appdata for both the Platform and the Sdk