Resolves: rhbz#1601882 fails to build with --nocheck

f41
Caolán McNamara 7 years ago
parent 39494f6c1c
commit ad255e6ca2

@ -64,7 +64,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.1 Version: %{libo_version}.1
Release: 1%{?libo_prerelease}%{?dist} Release: 2%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL: http://www.libreoffice.org/ URL: http://www.libreoffice.org/
@ -1256,6 +1256,8 @@ ln -s %{_datadir}/autocorr %{buildroot}%{baseinstdir}/share/autocorr
#remove it in case we didn't build with gcj #remove it in case we didn't build with gcj
rm -f %{buildroot}%{baseinstdir}/program/classes/sandbox.jar rm -f %{buildroot}%{baseinstdir}/program/classes/sandbox.jar
# we don't need this in the install
rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
#remove dummy .dat files #remove dummy .dat files
rm -f %{buildroot}%{baseinstdir}/program/root?.dat rm -f %{buildroot}%{baseinstdir}/program/root?.dat
@ -1476,14 +1478,9 @@ done
%check %check
%ifnarch ppc64 s390x aarch64 %ifnarch ppc64 s390x aarch64
make make
%endif
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 smoketest.subsequentcheck
# we don't need this anymore # we don't need this anymore
rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%endif
%files %files
@ -2321,6 +2318,9 @@ done
%{_includedir}/LibreOfficeKit %{_includedir}/LibreOfficeKit
%changelog %changelog
* Tue Jul 17 2018 Caolán McNamara <caolanm@redhat.com> - 1:6.0.6.1-2
- Resolves: rhbz#1601882 fails to build with --nocheck
* Tue Jul 17 2018 Caolán McNamara <caolanm@redhat.com> - 1:6.0.6.1-1 * Tue Jul 17 2018 Caolán McNamara <caolanm@redhat.com> - 1:6.0.6.1-1
- latest 6.0 release - latest 6.0 release

Loading…
Cancel
Save