diff --git a/libreoffice.changes b/libreoffice.changes index e5b58c2..963b934 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 29 13:27:48 UTC 2021 - Dominique Leuenberger + +- Source profile.d/alljava.sh from either /etc (if found) or + /usr/etc). + ------------------------------------------------------------------- Thu Jul 8 13:22:19 UTC 2021 - Markéta Machová diff --git a/libreoffice.spec b/libreoffice.spec index 31ff6e2..092de67 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1026,7 +1026,11 @@ echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile %define _lto_cflags %{nil} # do not eat all memory # make sure that JAVA_HOME is set correctly -source %{_sysconfdir}/profile.d/alljava.sh +if [ -f %{_sysconfdir}/profile.d/alljava.sh ]; then + . %{_sysconfdir}/profile.d/alljava.sh +elif [ -f %{_distconfdir}/profile.d/alljava.sh ]; then + . %{_distconfdir}/profile.d/alljava.sh +fi # use RPM_OPT_FLAGS, ... # remove big debugsymbols as we simply consume too much space %if %{with lto}