rpms
/
bind
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Reenable documentation building 

Latest release has not correctly formatted manual pages. Correct it by
rebuilding every manual page during the build, not only those modified
by a patch.

Fixed oot build of documentation. Because docbook does not work well
with out of tree builds, copy all sources required for documentation
into build directory. Should regenerate all manual pages, also html and
PDF formatted ARM.
This commit is contained in:
Petr Menšík 2020-11-30 14:10:37 +01:00
parent ad33c6c095
commit 46e0d484ee
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bind.spec
View File

@ -67,7 +67,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: MPLv2.0
Version: 9.11.25
Release: 1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
Release: 2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
Epoch: 32
Url: https://www.isc.org/downloads/bind/
#
@ -236,6 +236,10 @@ BuildRequires: docbook-style-xsl, libxslt
%if %{with TSAN}
BuildRequires: libtsan
%endif
%if %{with DOC}
BuildRequires: dblatex
BuildRequires: doxygen
%endif
%description
BIND (Berkeley Internet Name Domain) is an implementation of the DNS
@ -753,8 +757,18 @@ make man
popd
%if %{with DOC}
# Does not work. Use upstream generated documentation instead.
# make doc
# Because oot is not supported in docbook, copy required sources to build directory
pushd ..
# Note: force all manual pages regeneration, don't preserve timestamps
find -name '*.docbook' | while read F; do install -Dv "$F" "build/$F"; done
find doc -name '*.xml' | while read F; do [ -f "build/$F" ] || install -Dvp "$F" "build/$F"; done
popd
cp -upv ../doc/xsl/*.xsl doc/xsl/
cp -Rupv ../doc/xsl/graphics doc/xsl/
cp -upv ../doc/tex/notestyle.sty doc/tex/
cp -upv ../doc/arm/*.conf ../doc/arm/isc-logo.pdf doc/arm/
cp -upv ../doc/doxygen/*.html doc/doxygen
make doc
%endif
%if %{with DLZ}
@ -1072,7 +1086,7 @@ popd
%if %{with DOC}
mkdir -p ${RPM_BUILD_ROOT}%{_pkgdocdir}
cp -a doc/arm/*.html doc/arm/*.pdf ${RPM_BUILD_ROOT}%{_pkgdocdir}
cp -a build/doc/arm/{*.html,*.pdf} ${RPM_BUILD_ROOT}%{_pkgdocdir}
%endif
# Ghost config files:
@ -1608,6 +1622,9 @@ fi;
%endif
%changelog
* Mon Nov 30 2020 Petr Menšík <pemensik@redhat.com> - 32:9.11.25-2
- Regenerate all manual pages on build
* Thu Nov 26 2020 Petr Menšík <pemensik@redhat.com> - 32:9.11.25-1
- Update to 9.11.25