From cb65b2f1547af1ce2abdd87ff964ecb7890b7ce7cfe618811aac0c67da831eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Str=C3=B6der?= Date: Thu, 23 Nov 2017 15:05:30 +0000 Subject: [PATCH] Accepting request 544776 from home:RBrownSUSE:branches:server:dns Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544776 OBS-URL: https://build.opensuse.org/package/show/server:dns/unbound?expand=0&rev=66 --- unbound.changes | 6 ++++++ unbound.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/unbound.changes b/unbound.changes index ec25b06..f70f43e 100644 --- a/unbound.changes +++ b/unbound.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:49:02 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Tue Oct 10 08:20:16 UTC 2017 - michael@stroeder.com diff --git a/unbound.spec b/unbound.spec index aba6c10..9d66b31 100644 --- a/unbound.spec +++ b/unbound.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 + %bcond_without python %bcond_without munin %bcond_without hardened_build @@ -222,7 +227,7 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/unbound.service install -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/unbound-keygen.service install -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/unbound install -p -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/unbound -install -D -p -m 0644 %{SOURCE14} %{buildroot}/var/adm/fillup-templates/sysconfig.%{name} +install -D -p -m 0644 %{SOURCE14} %{buildroot}%{_fillupdir}/sysconfig.%{name} ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rcunbound ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rcunbound-keygen @@ -347,7 +352,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/unbound.conf || : %{_mandir}/man8/unbound-control-setup.8* %{_mandir}/man8/unbound-control.8* %{_mandir}/man1/unbound-streamtcp.1* -/var/adm/fillup-templates/sysconfig.%{name} +%{_fillupdir}/sysconfig.%{name} %if %{with systemd} %{_tmpfilesdir}/unbound.conf %{_unitdir}/unbound-keygen.service