From b6a529a997531b73f760aaca1891c293cab0a376 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Jan 31 2017 17:26:01 +0000
Subject: enable build of help on ARM again


---

diff --git a/libreoffice.spec b/libreoffice.spec
index 6bb7ce8..e28960b 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -39,11 +39,7 @@
 # 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
@@ -844,9 +840,7 @@ 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*}}} \
 } \
@@ -1125,9 +1119,7 @@ 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 \
@@ -1140,6 +1132,10 @@ touch autogen.lastrun
 
 ulimit -c unlimited
 export TMPDIR=/var/tmp
+%if 0%{?armhack}
+( make verbose=true helpcontent2.all \
+|| make verbose=true PARALLELISM=1 helpcontent2.all ) && \
+%endif
 make verbose=true build-nocheck
 
 #generate the icons and mime type stuff
@@ -1495,7 +1491,6 @@ 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
@@ -1507,7 +1502,6 @@ 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
@@ -1916,9 +1910,7 @@ 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
@@ -2011,9 +2003,7 @@ 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
@@ -2055,9 +2045,7 @@ 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
@@ -2079,9 +2067,7 @@ 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
@@ -2108,9 +2094,7 @@ 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
@@ -2138,9 +2122,7 @@ 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