Revert "enable build of help on ARM again"

This seems to work for F-25, but not for Rawhide...

This reverts commit c57ccbe29b.
f41
David Tardon 8 years ago
parent 45b823cad2
commit 357c5224fa

@ -40,7 +40,11 @@
# fedpkg compile/install/local/mockbuild does not handle --without ATM, # fedpkg compile/install/local/mockbuild does not handle --without ATM,
# so it is necessary to change this to bcond_with to achieve the same # so it is necessary to change this to bcond_with to achieve the same
# effect # effect
%if 0%{?armhack}
%bcond_with langpacks
%else
%bcond_without langpacks %bcond_without langpacks
%endif
# remove workdir at the end of %%build, to allow build on space-constrained machines # remove workdir at the end of %%build, to allow build on space-constrained machines
%ifarch s390 s390x %ifarch s390 s390x
@ -807,7 +811,9 @@ Provides additional %{langname} translations and resources for LibreOffice. \
%{-s:%{baseinstdir}/share/registry/%{-s*}_%{_langpack_lang}.xcd} \ %{-s:%{baseinstdir}/share/registry/%{-s*}_%{_langpack_lang}.xcd} \
%{-T: \ %{-T: \
%docdir %{baseinstdir}/help/%{_langpack_lang} \ %docdir %{baseinstdir}/help/%{_langpack_lang} \
%if !0%{?armhack}
%{baseinstdir}/help/%{_langpack_lang} \ %{baseinstdir}/help/%{_langpack_lang} \
%endif
} \ } \
%{-i:%{expand:%%_langpack_common %{-i*}}} \ %{-i:%{expand:%%_langpack_common %{-i*}}} \
} \ } \
@ -1089,7 +1095,9 @@ touch autogen.lastrun
--with-build-version="%{version}-%{release}" \ --with-build-version="%{version}-%{release}" \
--with-external-dict-dir=/usr/share/myspell \ --with-external-dict-dir=/usr/share/myspell \
--with-external-tar="$EXTSRCDIR" \ --with-external-tar="$EXTSRCDIR" \
%if !0%{?armhack}
--with-help \ --with-help \
%endif
--with-system-dicts \ --with-system-dicts \
--with-system-libs \ --with-system-libs \
--without-fonts \ --without-fonts \
@ -1101,10 +1109,6 @@ touch autogen.lastrun
ulimit -c unlimited ulimit -c unlimited
%if 0%{?armhack}
( make verbose=true helpcontent2.all \
|| make verbose=true PARALLELISM=1 helpcontent2.all ) && \
%endif
make verbose=true build-nocheck make verbose=true build-nocheck
#generate the icons and mime type stuff #generate the icons and mime type stuff
@ -1460,6 +1464,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%files core %files core
%dir %{baseinstdir} %dir %{baseinstdir}
%dir %{baseinstdir}/help %dir %{baseinstdir}/help
%if !0%{?armhack}
%docdir %{baseinstdir}/help/en-US %docdir %{baseinstdir}/help/en-US
%dir %{baseinstdir}/help/en-US %dir %{baseinstdir}/help/en-US
%{baseinstdir}/help/en-US/default.css %{baseinstdir}/help/en-US/default.css
@ -1471,6 +1476,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/help/en-US/sbasic.* %{baseinstdir}/help/en-US/sbasic.*
%{baseinstdir}/help/en-US/schart.* %{baseinstdir}/help/en-US/schart.*
%{baseinstdir}/help/en-US/shared.* %{baseinstdir}/help/en-US/shared.*
%endif
%{baseinstdir}/help/idxcaption.xsl %{baseinstdir}/help/idxcaption.xsl
%{baseinstdir}/help/idxcontent.xsl %{baseinstdir}/help/idxcontent.xsl
%{baseinstdir}/help/main_transform.xsl %{baseinstdir}/help/main_transform.xsl
@ -1882,7 +1888,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif %endif
%files base %files base
%if !0%{?armhack}
%{baseinstdir}/help/en-US/sdatabase.* %{baseinstdir}/help/en-US/sdatabase.*
%endif
%{baseinstdir}/program/classes/hsqldb.jar %{baseinstdir}/program/classes/hsqldb.jar
%{baseinstdir}/program/classes/reportbuilder.jar %{baseinstdir}/program/classes/reportbuilder.jar
%{baseinstdir}/program/classes/reportbuilderwizard.jar %{baseinstdir}/program/classes/reportbuilderwizard.jar
@ -1975,7 +1983,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%doc instdir/LICENSE %doc instdir/LICENSE
%files calc %files calc
%if !0%{?armhack}
%{baseinstdir}/help/en-US/scalc.* %{baseinstdir}/help/en-US/scalc.*
%endif
%{baseinstdir}/program/libanalysislo.so %{baseinstdir}/program/libanalysislo.so
%{baseinstdir}/program/libcalclo.so %{baseinstdir}/program/libcalclo.so
%{baseinstdir}/program/libdatelo.so %{baseinstdir}/program/libdatelo.so
@ -2018,7 +2028,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif %endif
%files draw %files draw
%if !0%{?armhack}
%{baseinstdir}/help/en-US/sdraw.* %{baseinstdir}/help/en-US/sdraw.*
%endif
%{baseinstdir}/share/registry/draw.xcd %{baseinstdir}/share/registry/draw.xcd
%{baseinstdir}/program/pagein-draw %{baseinstdir}/program/pagein-draw
%{baseinstdir}/program/sdraw %{baseinstdir}/program/sdraw
@ -2040,7 +2052,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{baseinstdir}/program/msgbox.py* %{baseinstdir}/program/msgbox.py*
%files writer %files writer
%if !0%{?armhack}
%{baseinstdir}/help/en-US/swriter.* %{baseinstdir}/help/en-US/swriter.*
%endif
%{baseinstdir}/program/libhwplo.so %{baseinstdir}/program/libhwplo.so
%{baseinstdir}/program/liblwpftlo.so %{baseinstdir}/program/liblwpftlo.so
%{baseinstdir}/program/libmswordlo.so %{baseinstdir}/program/libmswordlo.so
@ -2067,7 +2081,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif %endif
%files impress %files impress
%if !0%{?armhack}
%{baseinstdir}/help/en-US/simpress.* %{baseinstdir}/help/en-US/simpress.*
%endif
%{baseinstdir}/program/libanimcorelo.so %{baseinstdir}/program/libanimcorelo.so
%{baseinstdir}/program/libplacewarelo.so %{baseinstdir}/program/libplacewarelo.so
%{baseinstdir}/program/libPresentationMinimizerlo.so %{baseinstdir}/program/libPresentationMinimizerlo.so
@ -2095,7 +2111,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif %endif
%files math %files math
%if !0%{?armhack}
%{baseinstdir}/help/en-US/smath.* %{baseinstdir}/help/en-US/smath.*
%endif
%{baseinstdir}/program/libsmlo.so %{baseinstdir}/program/libsmlo.so
%{baseinstdir}/program/libsmdlo.so %{baseinstdir}/program/libsmdlo.so
%{baseinstdir}/program/resource/smen-US.res %{baseinstdir}/program/resource/smen-US.res

Loading…
Cancel
Save