Create doc subpackage

Subpackage is there just as shared documentation for main package.
I want to stay in original directory, files should not move since they
were in bind package.

Documentation is not regenerated, but used as shipped by upstream.
This commit is contained in:
Petr Menšík 2020-06-19 20:10:55 +02:00
parent 78aed13f06
commit 192c76c22a
1 changed files with 42 additions and 3 deletions

View File

@ -24,6 +24,7 @@
%bcond_with GEOIP %bcond_with GEOIP
# New MaxMind GeoLite support # New MaxMind GeoLite support
%bcond_without GEOIP2 %bcond_without GEOIP2
%bcond_without DOC
%if 0%{?fedora} >= 28 %if 0%{?fedora} >= 28
%bcond_without UNITTEST %bcond_without UNITTEST
%bcond_without DNSTAP %bcond_without DNSTAP
@ -37,6 +38,7 @@
%{?!bind_uid: %global bind_uid 25} %{?!bind_uid: %global bind_uid 25}
%{?!bind_gid: %global bind_gid 25} %{?!bind_gid: %global bind_gid 25}
%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
%global bind_dir /var/named %global bind_dir /var/named
%global chroot_prefix %{bind_dir}/chroot %global chroot_prefix %{bind_dir}/chroot
%if %{with SDB} %if %{with SDB}
@ -66,7 +68,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind Name: bind
License: MPLv2.0 License: MPLv2.0
Version: 9.11.20 Version: 9.11.20
Release: 2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Release: 3%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
Epoch: 32 Epoch: 32
Url: https://www.isc.org/downloads/bind/ Url: https://www.isc.org/downloads/bind/
# #
@ -242,7 +244,7 @@ BuildRequires: libmaxminddb-devel
BuildRequires: fstrm-devel protobuf-c-devel BuildRequires: fstrm-devel protobuf-c-devel
%endif %endif
# Needed to regenerate dig.1 manpage # Needed to regenerate dig.1 manpage
BuildRequires: docbook-style-xsl, libxslt BuildRequires: docbook-style-xsl, libxslt
%if %{with TSAN} %if %{with TSAN}
BuildRequires: libtsan BuildRequires: libtsan
%endif %endif
@ -496,6 +498,25 @@ BuildArch: noarch
%description -n python3-bind %description -n python3-bind
This package provides a module which allows commands to be sent to rndc directly from Python programs. This package provides a module which allows commands to be sent to rndc directly from Python programs.
%if %{with DOC}
%package doc
Summary: BIND 9 Administrator Reference Manual
Requires: bind-license = %{epoch}:%{version}-%{release}
BuildArch: noarch
%description doc
BIND (Berkeley Internet Name Domain) is an implementation of the DNS
(Domain Name System) protocols. BIND includes a DNS server (named),
which resolves host names to IP addresses; a resolver library
(routines for applications to use when interfacing with DNS); and
tools for verifying that the DNS server is operating properly.
This package contains BIND 9 Administrator Reference Manual
in HTML and PDF format.
%end
%endif
%if %{with EXPORT_LIBS} %if %{with EXPORT_LIBS}
%package export-libs %package export-libs
Summary: ISC libs for DHCP application Summary: ISC libs for DHCP application
@ -745,6 +766,11 @@ pushd bin/python
make man make man
popd popd
%if %{with DOC}
# Does not work. Use upstream generated documentation instead.
# make doc
%endif
%if %{with DLZ} %if %{with DLZ}
pushd contrib/dlz pushd contrib/dlz
pushd modules pushd modules
@ -1066,6 +1092,11 @@ ln -s dnssec-verify.8.gz dnssec-verify-pkcs11.8.gz
popd popd
%endif %endif
%if %{with DOC}
mkdir -p ${RPM_BUILD_ROOT}%{_pkgdocdir}
cp -a doc/arm/*.html doc/arm/*.pdf ${RPM_BUILD_ROOT}%{_pkgdocdir}
%endif
# Ghost config files: # Ghost config files:
touch ${RPM_BUILD_ROOT}%{_localstatedir}/log/named.log touch ${RPM_BUILD_ROOT}%{_localstatedir}/log/named.log
@ -1292,7 +1323,6 @@ fi;
%{_mandir}/man8/rndc-confgen.8* %{_mandir}/man8/rndc-confgen.8*
%{_mandir}/man8/named-journalprint.8* %{_mandir}/man8/named-journalprint.8*
%doc CHANGES README named.conf.default %doc CHANGES README named.conf.default
%doc doc/arm/*html doc/arm/*pdf
%doc sample/ %doc sample/
# Hide configuration # Hide configuration
@ -1602,8 +1632,17 @@ fi;
%{python3_sitelib}/*.egg-info %{python3_sitelib}/*.egg-info
%{python3_sitelib}/isc/ %{python3_sitelib}/isc/
%if %{with DOC}
%files doc
%dir %{_pkgdocdir}
%doc %{_pkgdocdir}/*.html
%doc %{_pkgdocdir}/*.pdf
%endif
%changelog %changelog
* Tue Jun 23 2020 Petr Menšík <pemensik@redhat.com> - 32:9.11.20-3
- Move documentation to separate bind-doc package
* Sat Jun 20 2020 Adrian Reber <adrian@lisas.de> - 32:9.11.20-2 * Sat Jun 20 2020 Adrian Reber <adrian@lisas.de> - 32:9.11.20-2
- Rebuilt for protobuf 3.12 - Rebuilt for protobuf 3.12