diff --git a/libreoffice.spec b/libreoffice.spec index 3979edc..c96af51 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1278,13 +1278,6 @@ for file in $files; do echo "%{_libdir}/%{name}/share/autocorr/$file" >> file-lists/common_list.txt done -# Symlink uno.py and unohelper.py so that python can find them -mkdir -p %{buildroot}%{python3_sitelib} -ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python3_sitelib}/uno.py -ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib}/unohelper.py -echo "%{python3_sitelib}/uno.py" >> file-lists/pyuno_list.txt -echo "%{python3_sitelib}/unohelper.py" >> file-lists/pyuno_list.txt - # Install appdata files, so we're shown in gnome-software (and other, future app stores) # upstream ships the files called libreoffice-{base,writer,...}, but the destop files are called base.destop [...] # fixup the appdata files internal reference to the .desktop file and rename them on the go to match the name @@ -1317,10 +1310,6 @@ chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3 %{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/program/ %{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/share/extensions/ %{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/share/Scripts/python/ -# pyuno links to pysitedir -pushd %{buildroot}/%{python3_sitelib} -%{python_type} -m compileall . -popd # Move python cache to respective filelist for i in file-lists/*.txt; do @@ -1342,6 +1331,14 @@ for i in file-lists/*.txt; do done rm pyfiles.txt +# Symlink uno.py and unohelper.py so that python can find them +# This is done after the cache files generating on purpose +mkdir -p %{buildroot}%{python3_sitelib} +ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python3_sitelib}/uno.py +ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib}/unohelper.py +echo "%{python3_sitelib}/uno.py" >> file-lists/pyuno_list.txt +echo "%{python3_sitelib}/unohelper.py" >> file-lists/pyuno_list.txt + # We have ton of duped files so run over it %fdupes %{buildroot}%{_prefix}