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

Move plugins to upstream default directory

Browse Source 
Keep backward-compatible links from old directory. Any original
configuration should keep running like before.
This commit is contained in:
Petr Menšík 2020-09-15 18:22:27 +02:00
parent f290ef8ed6
commit bd20caa99a
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bind.spec
View File

@ -40,7 +40,7 @@
%global chroot_prefix %{bind_dir}/chroot %global chroot_prefix %{bind_dir}/chroot
%global chroot_create_directories /dev /run/named %{_localstatedir}/{log,named,tmp} \\\ %global chroot_create_directories /dev /run/named %{_localstatedir}/{log,named,tmp} \\\
%{_sysconfdir}/{crypto-policies/back-ends,pki/dnssec-keys,named} \\\ %{_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 %global selinuxbooleans named_write_master_zones=1
## The order of libs is important. See lib/Makefile.in for details ## The order of libs is important. See lib/Makefile.in for details
@ -650,7 +650,7 @@ fi
%install %install
# Build directory hierarchy # Build directory hierarchy
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d 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}%{_localstatedir}/named/{slaves,data,dynamic}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
mkdir -p ${RPM_BUILD_ROOT}/run/named 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 for DIR in filesystem ldap mysql mysqldyn sqlite3; do
make -C $DIR DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/named install make -C $DIR DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/named install
done done
pushd ${RPM_BUILD_ROOT}/%{_libdir}/bind
cp -s ../named/dlz_*.so .
popd
mv mysqldyn/testing/README mysqldyn/testing/README.testing mv mysqldyn/testing/README mysqldyn/testing/README.testing
popd popd
popd popd
@ -1136,23 +1139,23 @@ fi;
%if %{with DLZ} %if %{with DLZ}
%files dlz-filesystem %files dlz-filesystem
%{_libdir}/bind/dlz_filesystem_dynamic.so %{_libdir}/{named,bind}/dlz_filesystem_dynamic.so
%files dlz-mysql %files dlz-mysql
%{_libdir}/bind/dlz_mysql_dynamic.so %{_libdir}/{named,bind}/dlz_mysql_dynamic.so
%doc contrib/dlz/modules/mysql/testing/* %doc contrib/dlz/modules/mysql/testing/*
%files dlz-mysqldyn %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/testing/*
%doc contrib/dlz/modules/mysqldyn/README* %doc contrib/dlz/modules/mysqldyn/README*
%files dlz-ldap %files dlz-ldap
%{_libdir}/bind/dlz_ldap_dynamic.so %{_libdir}/{named,bind}/dlz_ldap_dynamic.so
%doc contrib/dlz/modules/ldap/testing/* %doc contrib/dlz/modules/ldap/testing/*
%files dlz-sqlite3 %files dlz-sqlite3
%{_libdir}/bind/dlz_sqlite3_dynamic.so %{_libdir}/{named,bind}/dlz_sqlite3_dynamic.so
%doc contrib/dlz/modules/sqlite3/testing/* %doc contrib/dlz/modules/sqlite3/testing/*
%endif %endif

2
named-chroot.files
View File

@ -16,6 +16,8 @@
/etc/named /etc/named
/usr/lib64/bind /usr/lib64/bind
/usr/lib/bind /usr/lib/bind
/usr/lib64/named
/usr/lib/named
/usr/share/GeoIP /usr/share/GeoIP
/run/named /run/named
# Warning: the order is important # Warning: the order is important