Notification time stamped 2020-11-30 22:58:36 UTC
From 01b11df12b51d6b3d65d127fc7e0a6359096f71c Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik(a)redhat.com>
Date: Nov 30 2020 22:09:24 +0000
Subject: 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.
---
diff --git a/bind.spec b/bind.spec
index 839ce32..5d69a89 100644
--- a/bind.spec
+++ b/bind.spec
@@ -66,7 +66,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/
#
@@ -240,6 +240,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
@@ -749,6 +753,18 @@ pushd bin/python
make man
popd
+ # 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
%if %{with DLZ}
pushd contrib/dlz
pushd modules
@@ -1609,6 +1625,9 @@ fi;
%changelog
+* Mon Nov 30 2020 Petr Menšík <pemensik(a)redhat.com> - 32:9.11.25-2
+- Regenerate all manual pages on build
+
* Thu Nov 26 2020 Petr Menšík <pemensik(a)redhat.com> - 32:9.11.25-1
- Update to 9.11.25
https://src.fedoraproject.org/rpms/bind/c/01b11df12b51d6b3d65d127fc7e0a63...