From d1db955fba13a44df85adf0cdce8b156b90ebf741072e40e790895a35fbc17a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 24 Aug 2017 07:46:40 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=525 --- libreoffice.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 42ecae8..3640a0a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -941,7 +941,7 @@ PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-parallelism=$lo_jobs" fi -# make %{?_smp_mflags} sure that JAVA_HOME is set correctly +# make sure that JAVA_HOME is set correctly source %{_sysconfdir}/profile.d/alljava.sh # use RPM_OPT_FLAGS, ... # remove big debugsymbols as we simply consume too much space @@ -1039,20 +1039,20 @@ export NOCONFIGURE=yes --with-gdrive-client-id="${google_default_client_id}" # no coinormp packages for coinmp -# just call make %{?_smp_mflags} here as we added the jobs in configure +# just call make here as we added the jobs in configure # The check phase is run here too if it is split with nocheck # install of jars get broken sometimes -make %{?_smp_mflags} verbose=true build-nocheck +make verbose=true build-nocheck %check # Run tests only on 64b intel as they are resource hogs %ifarch x86_64 -make %{?_smp_mflags} +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 -#timeout -k 2m 2h make %{?_smp_mflags} smoketest.subsequentcheck +#timeout -k 2m 2h make smoketest.subsequentcheck # we don't need this anymore rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %endif