Accepting request 909227 from home:dimstar:Factory

- Source profile.d/alljava.sh from either /etc (if found) or
  /usr/etc).

OBS-URL: https://build.opensuse.org/request/show/909227
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=976
This commit is contained in:
Fridrich Strba 2021-07-29 22:19:40 +00:00 committed by Git OBS Bridge
parent 5ec7fb7dc3
commit 4fcbed5a10
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jul 29 13:27:48 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Source profile.d/alljava.sh from either /etc (if found) or
/usr/etc).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 8 13:22:19 UTC 2021 - Markéta Machová <mmachova@suse.com> Thu Jul 8 13:22:19 UTC 2021 - Markéta Machová <mmachova@suse.com>

View File

@ -1026,7 +1026,11 @@ echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
# do not eat all memory # do not eat all memory
# make sure that JAVA_HOME is set correctly # 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, ... # use RPM_OPT_FLAGS, ...
# remove big debugsymbols as we simply consume too much space # remove big debugsymbols as we simply consume too much space
%if %{with lto} %if %{with lto}