From 0327b7b8577f0c365295ed36cb7b2983736a7e97 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 24 Jan 2017 21:34:37 +0100 Subject: [PATCH] temp. disable building of help on ARM to fix build --- libreoffice.spec | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index df5e04e..1235a46 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -32,12 +32,19 @@ %global file_triggers 1 %endif %global girapiversion 0.1 +%ifarch %{arm} +%global armhack 1 +%endif # get english only and no-langpacks for a faster smoketest build # fedpkg compile/install/local/mockbuild does not handle --without ATM, # so it is necessary to change this to bcond_with to achieve the same # effect +%if 0%{?armhack} +%bcond_with langpacks +%else %bcond_without langpacks +%endif # remove workdir at the end of %%build, to allow build on space-constrained machines %ifarch s390 s390x @@ -802,7 +809,9 @@ Provides additional %{langname} translations and resources for LibreOffice. \ %{-s:%{baseinstdir}/share/registry/%{-s*}_%{_langpack_lang}.xcd} \ %{-T: \ %docdir %{baseinstdir}/help/%{_langpack_lang} \ +%if !0%{?armhack} %{baseinstdir}/help/%{_langpack_lang} \ +%endif } \ %{-i:%{expand:%%_langpack_common %{-i*}}} \ } \ @@ -1084,7 +1093,9 @@ touch autogen.lastrun --with-build-version="%{version}-%{release}" \ --with-external-dict-dir=/usr/share/myspell \ --with-external-tar="$EXTSRCDIR" \ +%if !0%{?armhack} --with-help \ +%endif --with-system-dicts \ --with-system-libs \ --without-fonts \ @@ -1451,6 +1462,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %files core %dir %{baseinstdir} %dir %{baseinstdir}/help +%if !0%{?armhack} %docdir %{baseinstdir}/help/en-US %dir %{baseinstdir}/help/en-US %{baseinstdir}/help/en-US/default.css @@ -1462,6 +1474,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/help/en-US/sbasic.* %{baseinstdir}/help/en-US/schart.* %{baseinstdir}/help/en-US/shared.* +%endif %{baseinstdir}/help/idxcaption.xsl %{baseinstdir}/help/idxcontent.xsl %{baseinstdir}/help/main_transform.xsl @@ -1873,7 +1886,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %files base +%if !0%{?armhack} %{baseinstdir}/help/en-US/sdatabase.* +%endif %{baseinstdir}/program/classes/hsqldb.jar %{baseinstdir}/program/classes/reportbuilder.jar %{baseinstdir}/program/classes/reportbuilderwizard.jar @@ -1966,7 +1981,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %doc instdir/LICENSE %files calc +%if !0%{?armhack} %{baseinstdir}/help/en-US/scalc.* +%endif %{baseinstdir}/program/libanalysislo.so %{baseinstdir}/program/libcalclo.so %{baseinstdir}/program/libdatelo.so @@ -2009,7 +2026,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %files draw +%if !0%{?armhack} %{baseinstdir}/help/en-US/sdraw.* +%endif %{baseinstdir}/share/registry/draw.xcd %{baseinstdir}/program/pagein-draw %{baseinstdir}/program/sdraw @@ -2031,7 +2050,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{baseinstdir}/program/msgbox.py* %files writer +%if !0%{?armhack} %{baseinstdir}/help/en-US/swriter.* +%endif %{baseinstdir}/program/libhwplo.so %{baseinstdir}/program/liblwpftlo.so %{baseinstdir}/program/libmswordlo.so @@ -2058,7 +2079,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %files impress +%if !0%{?armhack} %{baseinstdir}/help/en-US/simpress.* +%endif %{baseinstdir}/program/libanimcorelo.so %{baseinstdir}/program/libplacewarelo.so %{baseinstdir}/program/libPresentationMinimizerlo.so @@ -2086,7 +2109,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %files math +%if !0%{?armhack} %{baseinstdir}/help/en-US/smath.* +%endif %{baseinstdir}/program/libsmlo.so %{baseinstdir}/program/libsmdlo.so %{baseinstdir}/program/resource/smen-US.res @@ -2296,6 +2321,7 @@ done %changelog * Wed Jan 18 2017 David Tardon - 1:5.3.0.2-1 - update to 5.3.0 rc2 +- temp. disable building of help on ARM to fix build * Tue Jan 10 2017 David Tardon - 1:5.3.0.1-1 - update to 5.3.0 rc1