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.
This commit is contained in:
Petr Menšík 2020-09-16 16:52:39 +02:00
parent 7ffde7d755
commit 1f070d7ab3

View File

@ -362,18 +362,14 @@ Requires: bind%{?_isa} = %{epoch}:%{version}-%{release}
Dynamic Loadable Zones LDAP module for BIND server. Dynamic Loadable Zones LDAP module for BIND server.
%package dlz-mysql %package dlz-mysql
Summary: BIND server mysql DLZ module Summary: BIND server mysql and mysqldyn DLZ modules
Requires: bind%{?_isa} = %{epoch}:%{version}-%{release} Requires: bind%{?_isa} = %{epoch}:%{version}-%{release}
Provides: %{name}-dlz-mysqldyn
Obsoletes: %{name}-dlz-mysqldyn < 32:9.16.6-3
%description dlz-mysql %description dlz-mysql
Dynamic Loadable Zones MySQL module for BIND server. Dynamic Loadable Zones MySQL module for BIND server.
Contains also mysqldyn module with dynamic DNS updates (DDNS) support.
%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)
%package dlz-sqlite3 %package dlz-sqlite3
Summary: BIND server sqlite3 DLZ module 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 pushd ${RPM_BUILD_ROOT}/%{_libdir}/bind
cp -s ../named/dlz_*.so . cp -s ../named/dlz_*.so .
popd 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
popd popd
%endif %endif
@ -1134,12 +1133,9 @@ fi;
%files dlz-mysql %files dlz-mysql
%{_libdir}/{named,bind}/dlz_mysql_dynamic.so %{_libdir}/{named,bind}/dlz_mysql_dynamic.so
%doc contrib/dlz/modules/mysql/testing/* %doc build/contrib/dlz/modules/doc/mysql
%files dlz-mysqldyn
%{_libdir}/{named,bind}/dlz_mysqldyn_mod.so %{_libdir}/{named,bind}/dlz_mysqldyn_mod.so
%doc contrib/dlz/modules/mysqldyn/testing/* %doc build/contrib/dlz/modules/doc/mysqldyn
%doc contrib/dlz/modules/mysqldyn/README*
%files dlz-ldap %files dlz-ldap
%{_libdir}/{named,bind}/dlz_ldap_dynamic.so %{_libdir}/{named,bind}/dlz_ldap_dynamic.so