From 9a4be750942b2dc71227cf147f2dbbdf216e2926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Fri, 19 Jun 2020 20:10:55 +0200
Subject: [PATCH] Move documentation from bind-doc subdir to bind

Subpackage is there just as shared documentation for main package.
I want to stay in original directory, even most of paths have changed
since move to sphinx generated documentation.
---
 bind.spec             | 18 +++++++++++++++---
 bind99-rh640538.patch | 37 +++++++++++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/bind.spec b/bind.spec
index afa4d71..23934dc 100644
--- a/bind.spec
+++ b/bind.spec
@@ -36,6 +36,7 @@
 
 %{?!bind_uid:  %global bind_uid  25}
 %{?!bind_gid:  %global bind_gid  25}
+%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
 %global        bind_dir          /var/named
 %global        chroot_prefix     %{bind_dir}/chroot
 %global        chroot_create_directories /dev /run/named %{_localstatedir}/{log,named,tmp} \\\
@@ -66,7 +67,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  MPLv2.0
 Version:  9.16.4
-Release:  1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
+Release:  2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -800,6 +801,13 @@ ln -s ddns-confgen.8.gz tsig-keygen.8.gz
 ln -s named-checkzone.8.gz named-compilezone.8.gz
 popd
 
+%if %{with DOC}
+mkdir -p ${RPM_BUILD_ROOT}%{_pkgdocdir}
+cp -a build/doc/arm/{Bv9ARM.pdf,_build/html} build/doc/man/_build/html ${RPM_BUILD_ROOT}%{_pkgdocdir}
+cp -a build/doc/man/_build/html ${RPM_BUILD_ROOT}%{_pkgdocdir}/html/man
+rm -rf ${RPM_BUILD_ROOT}%{_pkgdocdir}/{html,html/man}/.{buildinfo,doctrees}
+%endif
+
 # Ghost config files:
 touch ${RPM_BUILD_ROOT}%{_localstatedir}/log/named.log
 
@@ -1195,11 +1203,15 @@ fi;
 
 %if %{with DOC}
 %files doc
-%doc build/doc/arm/_build/html
-%doc build/doc/arm/Bv9ARM.pdf
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/html
+%doc %{_pkgdocdir}/Bv9ARM.pdf
 %endif
 
 %changelog
+* Fri Jun 19 2020 Petr Menšík <pemensik@redhat.com> - 32:9.16.4-2
+- Move html into doc/bind
+
 * Thu Jun 18 2020 Petr Menšík <pemensik@redhat.com> - 32:9.16.4-1
 - Update to 9.16.4
 - Create separate bind-doc package with ARM
diff --git a/bind99-rh640538.patch b/bind99-rh640538.patch
index 54d7e1b..30e0a03 100644
--- a/bind99-rh640538.patch
+++ b/bind99-rh640538.patch
@@ -1,22 +1,43 @@
+From 8b0a284d551d24ec2323713a5641b783b6e1baaa Mon Sep 17 00:00:00 2001
+From: Petr Mensik <pemensik@redhat.com>
+Date: Fri, 19 Jun 2020 18:48:23 +0200
+Subject: [PATCH] .rh640538
+
+---
+ bin/dig/dig.rst | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
 diff --git a/bin/dig/dig.rst b/bin/dig/dig.rst
-index 3c899ce..3e9957b 100644
+index 3c899ce..46c9885 100644
 --- a/bin/dig/dig.rst
 +++ b/bin/dig/dig.rst
-@@ -616,6 +616,17 @@ like to turn off the IDN support for some reason, use parameters
+@@ -616,6 +616,26 @@ like to turn off the IDN support for some reason, use parameters
  ``+noidnin`` and ``+noidnout`` or define the IDN_DISABLE environment
  variable.
  
-+Return codes
++Return Codes
 +~~~~~~~~~~~~
 +
 +``dig`` return codes are:
 +
-+   0: Everything went well, including things like NXDOMAIN
-+   1: Usage error
-+   8: Couldn't open batch file
-+   9: No reply from server
-+   10: Internal error
++``0``
++   Response received, including NXDOMAIN status
++
++``1``
++   Usage error
++
++``8``
++   Couldn't open batch file
++
++``9``
++   No reply from server
++
++``10``
++   Internal error
 +
  Files
  ~~~~~
  
+-- 
+2.26.2
+