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

Move DLZ modules out of bind base package

Browse Source 
All DLZ modules were installed by mistake in main bind package.
Remove them from there, they should be offered only by each dlz
subpackage.

Move modules to upstream used directory %{_libdir}/named.
This commit is contained in:
Petr Menšík 2020-09-15 18:06:30 +02:00
parent 8a73c57ad4
commit f290ef8ed6
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bind.spec
View File

@ -579,8 +579,7 @@ popd
%endif %endif
%if %{with DLZ} %if %{with DLZ}
pushd contrib/dlz pushd contrib/dlz/modules
pushd modules
for DIR in mysql mysqldyn; do for DIR in mysql mysqldyn; do
sed -e 's/@DLZ_DRIVER_MYSQL_INCLUDES@/$(shell mysql_config --cflags)/' \ sed -e 's/@DLZ_DRIVER_MYSQL_INCLUDES@/$(shell mysql_config --cflags)/' \
-e 's/@DLZ_DRIVER_MYSQL_LIBS@/$(shell mysql_config --libs)/' \ -e 's/@DLZ_DRIVER_MYSQL_LIBS@/$(shell mysql_config --libs)/' \
@ -590,7 +589,6 @@ popd
make -C $DIR CFLAGS="-fPIC -I../include $CFLAGS $LDFLAGS" make -C $DIR CFLAGS="-fPIC -I../include $CFLAGS $LDFLAGS"
done done
popd popd
popd
%endif %endif
popd # build popd # build
@ -711,15 +709,13 @@ install -m 644 %{SOURCE49} ${RPM_BUILD_ROOT}%{_sysconfdir}/named-chroot.files
%if %{with DLZ} %if %{with DLZ}
pushd build pushd build
pushd contrib/dlz pushd contrib/dlz/modules
pushd modules
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}/bind install make -C $DIR DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/named install
done done
mv mysqldyn/testing/README mysqldyn/testing/README.testing mv mysqldyn/testing/README mysqldyn/testing/README.testing
popd popd
popd popd
popd
%endif %endif
# Install isc/errno2result.h header # Install isc/errno2result.h header
@ -938,8 +934,10 @@ fi;
%files %files
# TODO: Move from lib/bind to lib/named, as used by upstream # TODO: Move from lib/bind to lib/named, as used by upstream
%{_libdir}/bind %dir %{_libdir}/bind
%{_libdir}/named %dir %{_libdir}/named
%{_libdir}/named/*.so
%exclude %{_libdir}/named/dlz_*.so
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/named %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sysconfig/named
%config(noreplace) %attr(0644,root,named) %{_sysconfdir}/named.root.key %config(noreplace) %attr(0644,root,named) %{_sysconfdir}/named.root.key
%{_tmpfilesdir}/named.conf %{_tmpfilesdir}/named.conf