diff --git a/texlive.spec b/texlive.spec index 0572c2c..2e27f01 100644 --- a/texlive.spec +++ b/texlive.spec @@ -28,9 +28,16 @@ # Remove xdvi due to X11 removal from rhel10/c10s %global xdvi 0 +# texlive tex4ht java classes are not built for i686 as it requires javac for building +%ifarch %{ix86} +%global build_tex4ht_java 0 +%else +%global build_tex4ht_java 1 +%endif + Name: texlive Version: %{source_date} -Release: 6%{?dist} +Release: 6%{?dist}.alma.1 Epoch: %{tl_epoch} Summary: TeX formatting system Group: Applications/Publishing @@ -68,7 +75,9 @@ BuildRequires: python3-devel python3-setuptools # RPATH DIE DIE DIE BuildRequires: chrpath # need javac to build tex4ht.jar +%if 0%{?build_tex4ht_java} BuildRequires: /usr/bin/javac +%endif Requires: texlive-scheme-basic Requires: texlive-collection-latexrecommended @@ -24555,12 +24564,14 @@ done %make_build world STRIPPROG=/bin/true STRIP=/bin/true +%if 0%{?build_tex4ht_java} # build java classes for tex4ht from source and remove the prebuilt one mkdir tex4ht-java cd ../texk/tex4htk/java javac *.java */*.java */*/*.java -d ../../../work/tex4ht-java cd ../../../work/tex4ht-java jar cvf ../tex4ht-java/tex4ht.jar . +%endif %install # make directories @@ -25005,8 +25016,10 @@ chrpath --delete %{buildroot}%{_libdir}/libptexenc.so.* # Renaming it should prevent it from being included mv %{buildroot}%{_texdir}/texmf-dist/fonts/map/dvips/tetex/dvipdfm35.map %{buildroot}%{_texdir}/texmf-dist/fonts/map/dvips/tetex/dvipdfm35.oldmap +%if 0%{?build_tex4ht_java} # install java classes for tex4ht from source and remove the prebuilt one cp -f source/work/tex4ht-java/tex4ht.jar %{buildroot}%{_texdir}/texmf-dist/tex4ht/bin/tex4ht.jar +%endif # SCRIPTLETS %pretrans base -p @@ -27831,6 +27844,9 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || : %{_texdir}/texmf-dist/tex/latex/hypcap %changelog +* Wed Jan 14 2026 Eduard Abdullin - 13:20240311-6.alma.1 +- Exclude tex4ht-java classes for i686 as it requires javac for building + * Fri Dec 06 2024 Than Ngo - 13:20240311-6 - Resolves: RHEL-70243, remove xdvi due to removal of X11 in ghostscript - Resolves: RHEL-69757, fix python-sphinx FTBFS