diff --git a/bind.changes b/bind.changes index 11d4992..29c3d72 100644 --- a/bind.changes +++ b/bind.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:38:07 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Mon Nov 13 14:20:43 UTC 2017 - mpluskal@suse.com diff --git a/bind.spec b/bind.spec index 0467926..1ea3164 100644 --- a/bind.spec +++ b/bind.spec @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: bind %define pkg_name bind %define pkg_vers 9.10.4-P5 @@ -508,7 +513,7 @@ mkdir -p \ ${RPM_BUILD_ROOT}/%{_defaultdocdir}/bind \ ${RPM_BUILD_ROOT}/var/lib/named/{etc/named.d,dev,dyn,log,master,slave,var/{lib,run/{lwresd,named}}} \ ${RPM_BUILD_ROOT}%{_mandir}/{man1,man3,man5,man8} \ - ${RPM_BUILD_ROOT}/var/adm/fillup-templates \ + ${RPM_BUILD_ROOT}%{_fillupdir} \ ${RPM_BUILD_ROOT}/%{_rundir} \ ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services \ ${RPM_BUILD_ROOT}%{_includedir}/bind/dns \ @@ -558,7 +563,7 @@ ln -s ../lib/named/var/run/lwresd ${RPM_BUILD_ROOT}/var/run ln -s ../lib/named/var/run/named ${RPM_BUILD_ROOT}/var/run %endif for file in named-common named-named syslog-named; do - install -m 0644 vendor-files/sysconfig/${file} ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.${file} + install -m 0644 vendor-files/sysconfig/${file} ${RPM_BUILD_ROOT}%{_fillupdir}/sysconfig.${file} done install -m 644 vendor-files/sysconfig/SuSEFirewall.named %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/bind # Cleanup doc @@ -865,7 +870,7 @@ fi %{_datadir}/bind/createNamedConfInclude %{_datadir}/bind/ldapdump %ghost %{_rundir}/named -%{_var}/adm/fillup-templates/sysconfig.named-named +%{_fillupdir}/sysconfig.named-named %dir %{_var}/lib/named/master %attr(-,named,named) %dir %{_var}/lib/named/dyn %attr(-,named,named) %dir %{_var}/lib/named/slave @@ -958,8 +963,8 @@ fi %attr(0666, root, root) %dev(c, 1, 8) %{_var}/lib/named/dev/random %{_var}/lib/named/var/lib/named %{_var}/lib/named/var/log -%{_var}/adm/fillup-templates/sysconfig.named-common -%{_var}/adm/fillup-templates/sysconfig.syslog-named +%{_fillupdir}/sysconfig.named-common +%{_fillupdir}/sysconfig.syslog-named %files devel %defattr(-,root,root)