diff --git a/flatpak-runtime-config.spec b/flatpak-runtime-config.spec index a64e474..3f71f5f 100644 --- a/flatpak-runtime-config.spec +++ b/flatpak-runtime-config.spec @@ -1,11 +1,17 @@ Name: flatpak-runtime-config Version: 29 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Configuration files that live inside the flatpak runtime Source1: 50-flatpak.conf +Source2: usercustomize.py License: MIT +BuildRequires: python2 +BuildRequires: python2-rpm-macros +BuildRequires: python3 +BuildRequires: python3-rpm-macros + Requires: fontpackages-filesystem %description @@ -22,7 +28,13 @@ files that need to be different when executing a flatpak. 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 644 %{SOURCE1} +install -t $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -p -m 0644 %{SOURCE1} + +# usercustomize.py to set up Python paths +for d in %{python2_sitelib} %{python3_sitelib} ; do + mkdir -p $RPM_BUILD_ROOT/$d + install -t $RPM_BUILD_ROOT/$d -m 0644 %{SOURCE2} +done mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ echo "/app/%{_lib}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/app.conf @@ -52,10 +64,15 @@ HOME=/root /usr/bin/fc-cache -s %files %dir %{_prefix}/cache %dir %{_prefix}/cache/fontconfig +%{python2_sitelib} +%{python3_sitelib} %{_sysconfdir}/fonts/conf.d/* %{_sysconfdir}/ld.so.conf.d/app.conf %changelog +* Fri Sep 28 2018 Owen Taylor - 29-4 +- Add a usercustomize.py to set up Python paths + * Sat Sep 8 2018 Owen Taylor - 29-3 - Fix path to gsettings schemas in trigger