Merge branch 'rhbz1392538-chroot'

This commit is contained in:
Petr Menšík 2016-11-16 13:54:14 +01:00
commit 8afcc7945f

View File

@ -25,7 +25,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind Name: bind
License: MPLv2.0 License: MPLv2.0
Version: 9.11.0 Version: 9.11.0
Release: 1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist} Release: 2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
Epoch: 32 Epoch: 32
Url: http://www.isc.org/products/BIND/ Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -940,15 +940,17 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %{chroot_prefix}/var %dir %{chroot_prefix}/var
%dir %{chroot_prefix}/run %dir %{chroot_prefix}/run
%dir %{chroot_prefix}/var/named %dir %{chroot_prefix}/var/named
%dir %{chroot_prefix}/%{_libdir}/bind
%ghost %config(noreplace) %{chroot_prefix}/etc/named.conf %ghost %config(noreplace) %{chroot_prefix}/etc/named.conf
%defattr(0660,named,named,0770) %defattr(-,root,root,-)
%dir %{chroot_prefix}/run/named
%dir %{chroot_prefix}/var/tmp
%dir %{chroot_prefix}/var/log
%{chroot_prefix}/var/run
%dir %{chroot_prefix}/usr %dir %{chroot_prefix}/usr
%dir %{chroot_prefix}/%{_libdir} %dir %{chroot_prefix}/%{_libdir}
%dir %{chroot_prefix}/%{_libdir}/bind
%defattr(0660,named,named,0770)
%dir %{chroot_prefix}/var/tmp
%dir %{chroot_prefix}/var/log
%defattr(-,named,named,-)
%dir %{chroot_prefix}/run/named
%{chroot_prefix}/var/run
%if %{SDB} %if %{SDB}
%files sdb-chroot %files sdb-chroot
@ -970,15 +972,17 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %{chroot_sdb_prefix}/var %dir %{chroot_sdb_prefix}/var
%dir %{chroot_sdb_prefix}/run %dir %{chroot_sdb_prefix}/run
%dir %{chroot_sdb_prefix}/var/named %dir %{chroot_sdb_prefix}/var/named
%dir %{chroot_sdb_prefix}/%{_libdir}/bind
%ghost %config(noreplace) %{chroot_sdb_prefix}/etc/named.conf %ghost %config(noreplace) %{chroot_sdb_prefix}/etc/named.conf
%defattr(0660,named,named,0770) %defattr(-,root,root,-)
%dir %{chroot_sdb_prefix}/run/named
%dir %{chroot_sdb_prefix}/var/tmp
%dir %{chroot_sdb_prefix}/var/log
%{chroot_sdb_prefix}/var/run
%dir %{chroot_sdb_prefix}/usr %dir %{chroot_sdb_prefix}/usr
%dir %{chroot_sdb_prefix}/%{_libdir} %dir %{chroot_sdb_prefix}/%{_libdir}
%dir %{chroot_sdb_prefix}/%{_libdir}/bind
%defattr(0660,named,named,0770)
%dir %{chroot_sdb_prefix}/var/tmp
%dir %{chroot_sdb_prefix}/var/log
%defattr(-,named,named,-)
%dir %{chroot_sdb_prefix}/run/named
%{chroot_sdb_prefix}/var/run
%endif %endif
%if %{PKCS11} %if %{PKCS11}
@ -1018,6 +1022,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{python3_sitelib}/isc/__pycache__/*py* %{python3_sitelib}/isc/__pycache__/*py*
%changelog %changelog
* Wed Nov 16 2016 Petr Menšík <pemensik@redhat.com> - 32:9.11.0-2.P1
- Do not change lib permissions in chroot
* Wed Nov 16 2016 Michal Ruprich <mruprich@redhat.com> - 32:9.11.0-1.P1 * Wed Nov 16 2016 Michal Ruprich <mruprich@redhat.com> - 32:9.11.0-1.P1
- Update to 9.11.0-P1 - Update to 9.11.0-P1