rpm/bind
SHA256
1
0
Fork 0
forked from pool/bind
Code Pull Requests Activity

Accepting request 544658 from home:RBrownSUSE:branches:network

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544658
OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=223
This commit is contained in:
Dirk Mueller 2017-11-24 10:22:50 +00:00 committed by Git OBS Bridge
parent fc48f6ba17
commit 6c11f8d877
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bind.changes
View File

@ -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 Mon Nov 13 14:20:43 UTC 2017 - mpluskal@suse.com

15
bind.spec
View File

@ -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 Name: bind
%define pkg_name bind %define pkg_name bind
%define pkg_vers 9.10.4-P5 %define pkg_vers 9.10.4-P5
@ -508,7 +513,7 @@ mkdir -p \
${RPM_BUILD_ROOT}/%{_defaultdocdir}/bind \ ${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}/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}%{_mandir}/{man1,man3,man5,man8} \
${RPM_BUILD_ROOT}/var/adm/fillup-templates \ ${RPM_BUILD_ROOT}%{_fillupdir} \
${RPM_BUILD_ROOT}/%{_rundir} \ ${RPM_BUILD_ROOT}/%{_rundir} \
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services \ ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services \
${RPM_BUILD_ROOT}%{_includedir}/bind/dns \ ${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 ln -s ../lib/named/var/run/named ${RPM_BUILD_ROOT}/var/run
%endif %endif
for file in named-common named-named syslog-named; do 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 done
install -m 644 vendor-files/sysconfig/SuSEFirewall.named %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/bind install -m 644 vendor-files/sysconfig/SuSEFirewall.named %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/bind
# Cleanup doc # Cleanup doc
@ -865,7 +870,7 @@ fi
%{_datadir}/bind/createNamedConfInclude %{_datadir}/bind/createNamedConfInclude
%{_datadir}/bind/ldapdump %{_datadir}/bind/ldapdump
%ghost %{_rundir}/named %ghost %{_rundir}/named
%{_var}/adm/fillup-templates/sysconfig.named-named %{_fillupdir}/sysconfig.named-named
%dir %{_var}/lib/named/master %dir %{_var}/lib/named/master
%attr(-,named,named) %dir %{_var}/lib/named/dyn %attr(-,named,named) %dir %{_var}/lib/named/dyn
%attr(-,named,named) %dir %{_var}/lib/named/slave %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 %attr(0666, root, root) %dev(c, 1, 8) %{_var}/lib/named/dev/random
%{_var}/lib/named/var/lib/named %{_var}/lib/named/var/lib/named
%{_var}/lib/named/var/log %{_var}/lib/named/var/log
%{_var}/adm/fillup-templates/sysconfig.named-common %{_fillupdir}/sysconfig.named-common
%{_var}/adm/fillup-templates/sysconfig.syslog-named %{_fillupdir}/sysconfig.syslog-named
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)