From 7be72b675e82972952e67ed1896aaba995d1bb28 Mon Sep 17 00:00:00 2001 From: Petr Menšík Date: Aug 31 2020 12:09:33 +0000 Subject: Disable PDF regeneration Because pending issues with PDF regeneration, disable PDF for now. Allow turning it on with --with DOCPDF. It prevents building successfully on Rawhide/f33 for some reason. --- diff --git a/bind.spec b/bind.spec index ff412e9..cd58c9c 100644 --- a/bind.spec +++ b/bind.spec @@ -32,6 +32,8 @@ %bcond_with LMDB %bcond_with DOC %endif +# Because of issues with PDF rebuild, include only HTML pages +%bcond_with DOCPDF %bcond_with TSAN %{?!bind_uid: %global bind_uid 25} @@ -193,9 +195,12 @@ BuildRequires: fstrm-devel protobuf-c-devel # Needed to regenerate dig.1 manpage %if %{with DOC} BuildRequires: python3-sphinx python3-sphinx_rtd_theme -BuildRequires: python3-sphinx-latex latexmk texlive-xetex texlive-xindy BuildRequires: doxygen %endif +%if %{with DOCPDF} +# Because remaining issues with COPR, allow turning off PDF (re)generation +BuildRequires: python3-sphinx-latex latexmk texlive-xetex texlive-xindy +%endif %if %{with TSAN} BuildRequires: libtsan %endif @@ -579,7 +584,7 @@ export LIBDIR_SUFFIX popd %endif -%if %{with DOC} +%if %{with DOCPDF} # avoid using home for pdf latex files export TEXMFVAR="`pwd`" export TEXMFCONFIG="`pwd`" @@ -812,10 +817,13 @@ popd %if %{with DOC} mkdir -p ${RPM_BUILD_ROOT}%{_pkgdocdir}/html/man -cp -a build/doc/arm/{Bv9ARM.pdf,_build/html} ${RPM_BUILD_ROOT}%{_pkgdocdir} +cp -a build/doc/arm/_build/html ${RPM_BUILD_ROOT}%{_pkgdocdir} cp -a build/doc/man/_build/html ${RPM_BUILD_ROOT}%{_pkgdocdir}/html rm -rf ${RPM_BUILD_ROOT}%{_pkgdocdir}/html/.{buildinfo,doctrees} %endif +%if %{with DOCPDF} +cp -a build/doc/arm/Bv9ARM.pdf ${RPM_BUILD_ROOT}%{_pkgdocdir} +%endif # Ghost config files: touch ${RPM_BUILD_ROOT}%{_localstatedir}/log/named.log @@ -1214,6 +1222,8 @@ fi; %files doc %dir %{_pkgdocdir} %doc %{_pkgdocdir}/html +%endif +%if %{with DOCPDF} %doc %{_pkgdocdir}/Bv9ARM.pdf %endif