From 1f070d7ab35f4651e31b506f440239f2823830c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Wed, 16 Sep 2020 16:52:39 +0200
Subject: [PATCH] Move mysql DLZ modules together

Remove dlz-mysqldyn subpackage, move documentation and modules to the
same package. It is similar and has exactly the same dependencies,
different package is not required.
---
 bind.spec | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/bind.spec b/bind.spec
index 3ecc99a..725d270 100644
--- a/bind.spec
+++ b/bind.spec
@@ -362,18 +362,14 @@ Requires: bind%{?_isa} = %{epoch}:%{version}-%{release}
 Dynamic Loadable Zones LDAP module for BIND server.
 
 %package dlz-mysql
-Summary: BIND server mysql DLZ module
+Summary: BIND server mysql and mysqldyn DLZ modules
 Requires: bind%{?_isa} = %{epoch}:%{version}-%{release}
+Provides: %{name}-dlz-mysqldyn
+Obsoletes: %{name}-dlz-mysqldyn < 32:9.16.6-3
 
 %description dlz-mysql
 Dynamic Loadable Zones MySQL module for BIND server.
-
-%package dlz-mysqldyn
-Summary: BIND server mysqldyn DLZ module
-Requires: bind%{?_isa} = %{epoch}:%{version}-%{release}
-
-%description dlz-mysqldyn
-BIND 9 DLZ MySQL module with support for dynamic DNS (DDNS)
+Contains also mysqldyn module with dynamic DNS updates (DDNS) support.
 
 %package dlz-sqlite3
 Summary: BIND server sqlite3 DLZ module
@@ -713,7 +709,10 @@ install -m 644 %{SOURCE49} ${RPM_BUILD_ROOT}%{_sysconfdir}/named-chroot.files
   pushd ${RPM_BUILD_ROOT}/%{_libdir}/bind
     cp -s ../named/dlz_*.so .
   popd
-  mv mysqldyn/testing/README mysqldyn/testing/README.testing
+  mkdir -p doc/{mysql,mysqldyn}
+  cp -p mysqldyn/testing/README doc/mysqldyn/README.testing
+  cp -p mysqldyn/testing/* doc/mysqldyn
+  cp -p mysql/testing/* doc/mysql
   popd
   popd
 %endif
@@ -1134,12 +1133,9 @@ fi;
 
 %files dlz-mysql
 %{_libdir}/{named,bind}/dlz_mysql_dynamic.so
-%doc contrib/dlz/modules/mysql/testing/*
-
-%files dlz-mysqldyn
+%doc build/contrib/dlz/modules/doc/mysql
 %{_libdir}/{named,bind}/dlz_mysqldyn_mod.so
-%doc contrib/dlz/modules/mysqldyn/testing/*
-%doc contrib/dlz/modules/mysqldyn/README*
+%doc build/contrib/dlz/modules/doc/mysqldyn
 
 %files dlz-ldap
 %{_libdir}/{named,bind}/dlz_ldap_dynamic.so