From 6a734a4721eb97cf0ba0af97a7cda4ac340687b9 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Feb 18 2017 18:01:54 +0000 Subject: disable building of help on ARM to fix build --- diff --git a/libreoffice.spec b/libreoffice.spec index b67b8ed..5df798a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -35,6 +35,9 @@ %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, @@ -884,7 +887,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*}}} \ } \ @@ -1161,7 +1166,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 \ @@ -1529,6 +1536,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 @@ -1540,6 +1548,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 @@ -1957,7 +1966,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 @@ -2050,7 +2061,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 @@ -2092,7 +2105,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 @@ -2114,7 +2129,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 @@ -2141,7 +2158,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 @@ -2169,7 +2188,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 @@ -2380,6 +2401,7 @@ done * Thu Feb 16 2017 Eike Rathke - 1:5.1.6.2-7 - Resolves: tdf#103493 copying note captions needs a completed destination sheet - Resolves: tdf#105968 handle engineering notation rounded into next magnitude +- disable internal help on ARM to fix build problems * Tue Nov 29 2016 David Tardon - 1:5.1.6.2-6 - avoid loss of text in edited placeholder on save