- Fix pyuno paths wrt bsc#1059720
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=539
This commit is contained in:
parent
8dd339f912
commit
0f56bf47c2
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 2 09:24:49 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Fix pyuno paths wrt bsc#1059720
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 12 10:52:03 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
|
@ -1064,10 +1064,10 @@ make
|
||||
unset WITH_LANG
|
||||
# work around flawed accessibility check
|
||||
export JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1"
|
||||
export OOO_TEST_SOFFICE=path:%{buildroot}%{baseinstdir}/program/soffice
|
||||
export OOO_TEST_SOFFICE=path:%{buildroot}%{_libdir}/libreoffice/program/soffice
|
||||
#timeout -k 2m 2h make smoketest.subsequentcheck
|
||||
# we don't need this anymore
|
||||
rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
|
||||
rm -f %{buildroot}%{_libdir}/libreoffice/program/classes/smoketest.jar
|
||||
%endif
|
||||
|
||||
%install
|
||||
@ -1220,7 +1220,7 @@ rm -rf %{buildroot}%{_libdir}/%{name}/readmes/
|
||||
|
||||
# Prepare uno path detection, can't be patched in because it breaks tests
|
||||
echo "import sys, os" > uno.py
|
||||
echo "sys.path.append('%{baseinstdir}/program')" >> uno.py
|
||||
echo "sys.path.append('%{_libdir}/%{name}/program')" >> uno.py
|
||||
echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:%{_libdir}/libreoffice/program/fundamentalrc')" >> uno.py
|
||||
cat %{buildroot}%{_libdir}/%{name}/program/uno.py >> uno.py
|
||||
cp uno.py %{buildroot}%{_libdir}/%{name}/program/uno.py
|
||||
|
Loading…
x
Reference in New Issue
Block a user