Accepting request 544860 from server:dns

OBS-URL: https://build.opensuse.org/request/show/544860
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/unbound?expand=0&rev=20

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
 

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