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

Share pkcs11-utils and dnssec-utils manuals

Browse Source 
Previous build recommended bind-dnssec-utils just to provide manual for
pkcs11 variants. Instead, share the same files between pkcs11-utils and
dnssec-utils. Skip unnecessary manual of non-existent dnssec-coverage-pkcs11 tool.
This commit is contained in:
Petr Menšík 2019-09-04 19:12:36 +02:00
parent 9d1aaa502b
commit d568c54c25
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bind.spec
View File

@ -61,7 +61,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.10 Version: 9.11.10
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/
# #
@ -251,8 +251,6 @@ For other supported HSM modules please check the BIND documentation.
Summary: Bind tools with native PKCS#11 for using DNSSEC Summary: Bind tools with native PKCS#11 for using DNSSEC
Requires: bind-pkcs11-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: bind-pkcs11-libs%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: bind-pkcs11 < 32:9.9.4-16.P2 Obsoletes: bind-pkcs11 < 32:9.9.4-16.P2
# Used manual pages are just links to dnssec-utils. Propose it to installation
Recommends: bind-dnssec-utils
%description pkcs11-utils %description pkcs11-utils
This is a set of PKCS#11 utilities that when used together create rsa This is a set of PKCS#11 utilities that when used together create rsa
@ -1006,7 +1004,6 @@ install -m 644 %{SOURCE34} ${RPM_BUILD_ROOT}%{_mandir}/man1/zone2sqlite.1
pushd ${RPM_BUILD_ROOT}%{_mandir}/man8 pushd ${RPM_BUILD_ROOT}%{_mandir}/man8
ln -s named.8.gz named-pkcs11.8.gz ln -s named.8.gz named-pkcs11.8.gz
ln -s dnssec-checkds.8.gz dnssec-checkds-pkcs11.8.gz ln -s dnssec-checkds.8.gz dnssec-checkds-pkcs11.8.gz
ln -s dnssec-coverage.8.gz dnssec-coverage-pkcs11.8.gz
ln -s dnssec-dsfromkey.8.gz dnssec-dsfromkey-pkcs11.8.gz ln -s dnssec-dsfromkey.8.gz dnssec-dsfromkey-pkcs11.8.gz
ln -s dnssec-importkey.8.gz dnssec-importkey-pkcs11.8.gz ln -s dnssec-importkey.8.gz dnssec-importkey-pkcs11.8.gz
ln -s dnssec-keyfromlabel.8.gz dnssec-keyfromlabel-pkcs11.8.gz ln -s dnssec-keyfromlabel.8.gz dnssec-keyfromlabel-pkcs11.8.gz
@ -1462,6 +1459,9 @@ fi;
%{_sbindir}/pkcs11-tokens %{_sbindir}/pkcs11-tokens
%{_mandir}/man8/pkcs11*.8* %{_mandir}/man8/pkcs11*.8*
%{_mandir}/man8/dnssec*-pkcs11.8* %{_mandir}/man8/dnssec*-pkcs11.8*
%{_mandir}/man8/dnssec*.8*
%exclude %{_mandir}/man8/dnssec-coverage.8*
%exclude %{_mandir}/man8/dnssec-keymgr.8*
%files pkcs11-libs %files pkcs11-libs
%{_libdir}/libdns-pkcs11.so.%{sover_dns}* %{_libdir}/libdns-pkcs11.so.%{sover_dns}*
@ -1542,6 +1542,9 @@ fi;
%changelog %changelog
* Wed Sep 04 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.10-3
- Share pkcs11-utils and dnssec-utils manuals instead of recommend
* Tue Sep 03 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.10-2 * Tue Sep 03 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.10-2
- Move some administration utilities back to bind-utils (#1720380) - Move some administration utilities back to bind-utils (#1720380)
- Add GeoIP to bind-chroot (#1497646) - Add GeoIP to bind-chroot (#1497646)