From df85ecbfa56e1c57a2cb219ea07b726f8fd69d520a2ea25087fc7e5fe260756f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 17 Apr 2015 12:57:25 +0000 Subject: [PATCH] - Fix python3_sitelib not being around for py2 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=261 --- libreoffice.changes | 5 +++++ libreoffice.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index b136bd7..f4ff837 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 17 12:57:07 UTC 2015 - tchvatal@suse.com + +- Fix python3_sitelib not being around for py2 + ------------------------------------------------------------------- Thu Apr 16 12:23:40 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 5c7c162..45176d6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -51,6 +51,7 @@ %global python_type python3 %else %global python_type python +%global python3_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") %endif # List of supported langs, populated bellow in the lang macros %global langpack_langs %{nil} @@ -1278,6 +1279,8 @@ done 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 [...] @@ -1425,8 +1428,6 @@ exit 0 %files -f file-lists/pyuno_list.txt pyuno %defattr(-,root,root) -%{python3_sitelib}/uno.py -%{python3_sitelib}/unohelper.py %files -f file-lists/gnome_list.txt gnome %defattr(-,root,root)