From bd20caa99a248d8f44be17c5828cc36347ab6416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Tue, 15 Sep 2020 18:22:27 +0200
Subject: [PATCH] Move plugins to upstream default directory

Keep backward-compatible links from old directory. Any original
configuration should keep running like before.
---
 bind.spec          | 17 ++++++++++-------
 named-chroot.files |  2 ++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/bind.spec b/bind.spec
index 1ddeb0a..96c852d 100644
--- a/bind.spec
+++ b/bind.spec
@@ -40,7 +40,7 @@
 %global        chroot_prefix     %{bind_dir}/chroot
 %global        chroot_create_directories /dev /run/named %{_localstatedir}/{log,named,tmp} \\\
                                          %{_sysconfdir}/{crypto-policies/back-ends,pki/dnssec-keys,named} \\\
-                                         %{_libdir}/bind %{_datadir}/GeoIP
+                                         %{_libdir}/bind %{_libdir}/named %{_datadir}/GeoIP
 
 %global        selinuxbooleans   named_write_master_zones=1
 ## The order of libs is important. See lib/Makefile.in for details
@@ -650,7 +650,7 @@ fi
 %install
 # Build directory hierarchy
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bind
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/{bind,named}
 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/named/{slaves,data,dynamic}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
 mkdir -p ${RPM_BUILD_ROOT}/run/named
@@ -713,6 +713,9 @@ install -m 644 %{SOURCE49} ${RPM_BUILD_ROOT}%{_sysconfdir}/named-chroot.files
   for DIR in filesystem ldap mysql mysqldyn sqlite3; do
     make -C $DIR DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/named install
   done
+  pushd ${RPM_BUILD_ROOT}/%{_libdir}/bind
+    cp -s ../named/dlz_*.so .
+  popd
   mv mysqldyn/testing/README mysqldyn/testing/README.testing
   popd
   popd
@@ -1136,23 +1139,23 @@ fi;
 
 %if %{with DLZ}
 %files dlz-filesystem
-%{_libdir}/bind/dlz_filesystem_dynamic.so
+%{_libdir}/{named,bind}/dlz_filesystem_dynamic.so
 
 %files dlz-mysql
-%{_libdir}/bind/dlz_mysql_dynamic.so
+%{_libdir}/{named,bind}/dlz_mysql_dynamic.so
 %doc contrib/dlz/modules/mysql/testing/*
 
 %files dlz-mysqldyn
-%{_libdir}/bind/dlz_mysqldyn_mod.so
+%{_libdir}/{named,bind}/dlz_mysqldyn_mod.so
 %doc contrib/dlz/modules/mysqldyn/testing/*
 %doc contrib/dlz/modules/mysqldyn/README*
 
 %files dlz-ldap
-%{_libdir}/bind/dlz_ldap_dynamic.so
+%{_libdir}/{named,bind}/dlz_ldap_dynamic.so
 %doc contrib/dlz/modules/ldap/testing/*
 
 %files dlz-sqlite3
-%{_libdir}/bind/dlz_sqlite3_dynamic.so
+%{_libdir}/{named,bind}/dlz_sqlite3_dynamic.so
 %doc contrib/dlz/modules/sqlite3/testing/*
 
 %endif
diff --git a/named-chroot.files b/named-chroot.files
index 43c559a..9a768e4 100644
--- a/named-chroot.files
+++ b/named-chroot.files
@@ -16,6 +16,8 @@
 /etc/named
 /usr/lib64/bind
 /usr/lib/bind
+/usr/lib64/named
+/usr/lib/named
 /usr/share/GeoIP
 /run/named
 # Warning: the order is important