From 8cd5c11f0db378f98629f346de54da9093a647aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Tue, 3 Sep 2019 11:30:50 +0200
Subject: [PATCH] Move some administration utilities back to utils (#1720380)

Some utilities are not related DNSSEC at all, but are just bind related
tools. Because they do not require additional dependencies, they do not
save any space in containers.
---
 bind.spec | 51 +++++++++++++++++++++++----------------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/bind.spec b/bind.spec
index 97be60f..a35699e 100644
--- a/bind.spec
+++ b/bind.spec
@@ -57,7 +57,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  MPLv2.0
 Version:  9.11.10
-Release:  1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
+Release:  2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -321,10 +321,6 @@ Contains license of the BIND DNS suite.
 Summary: Utilities for querying DNS name servers
 Requires: bind-libs-lite%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release}
-# TODO: this is just temporary workaround until all packages depending on
-# bind-utils can be satisfied without dnssec-utils
-# It will be removed after some time, or changed to Recommends
-Suggests: bind-dnssec-utils
 # For compatibility with Debian package
 Provides: dnsutils = %{epoch}:%{version}-%{release}
 
@@ -1305,46 +1301,42 @@ fi;
 %{_bindir}/nslookup
 %{_bindir}/nsupdate
 %{_bindir}/arpaname
+%{_sbindir}/ddns-confgen
+%{_sbindir}/tsig-keygen
+%{_sbindir}/genrandom
+%{_sbindir}/nsec3hash
+%{_sbindir}/isc-hmac-fixup
+%{_sbindir}/named-checkzone
+%{_sbindir}/named-compilezone
 %if %{with DNSTAP}
 %{_bindir}/dnstap-read
 %{_mandir}/man1/dnstap-read.1*
 %endif
+%if %{with LMDB}
+%{_sbindir}/named-nzd2nzf
+%{_mandir}/man8/named-nzd2nzf.8*
+%endif
 %{_mandir}/man1/host.1*
 %{_mandir}/man1/nsupdate.1*
 %{_mandir}/man1/dig.1*
 %{_mandir}/man1/delv.1*
 %{_mandir}/man1/nslookup.1*
 %{_mandir}/man1/arpaname.1*
-%{_sysconfdir}/trusted-key.key
-
-%files dnssec-utils
-%{_sbindir}/ddns-confgen
-%{_sbindir}/tsig-keygen
-%{_sbindir}/genrandom
-%{_sbindir}/nsec3hash
-%{_sbindir}/dnssec*
-%if %{with PKCS11}
-%exclude %{_sbindir}/dnssec*pkcs11
-%endif
-%{_sbindir}/isc-hmac-fixup
-%{_sbindir}/named-checkzone
-%{_sbindir}/named-compilezone
-%if %{with LMDB}
-%{_sbindir}/named-nzd2nzf
-%endif
 %{_mandir}/man8/ddns-confgen.8*
 %{_mandir}/man8/tsig-keygen.8*
 %{_mandir}/man8/genrandom.8*
 %{_mandir}/man8/nsec3hash.8*
-%{_mandir}/man8/dnssec*.8*
-%if %{with PKCS11}
-%exclude %{_mandir}/man8/dnssec*-pkcs11.8*
-%endif
 %{_mandir}/man8/isc-hmac-fixup.8*
 %{_mandir}/man8/named-checkzone.8*
 %{_mandir}/man8/named-compilezone.8*
-%if %{with LMDB}
-%{_mandir}/man8/named-nzd2nzf.8*
+%{_sysconfdir}/trusted-key.key
+
+%files dnssec-utils
+%{_sbindir}/dnssec*
+%{_mandir}/man8/dnssec*.8*
+%if %{with PKCS11}
+%exclude %{_sbindir}/dnssec*pkcs11
+%exclude %{_mandir}/man8/dnssec*-pkcs11.8*
 %endif
 
 %if %{with DEVEL}
@@ -1544,6 +1536,9 @@ fi;
 
 
 %changelog
+* Tue Sep 03 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.10-2
+- Move some administration utilities back to bind-utils (#1720380)
+
 * Tue Aug 27 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.10-1
 - Update to 9.11.10