From 64184f493f8b75bc32ad37a821034d9f35b247f6c9a4d3f65fd482171c955e8f Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Thu, 23 Nov 2017 18:08:11 +0000 Subject: [PATCH] Accepting request 544661 from home:RBrownSUSE:branches:network Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544661 OBS-URL: https://build.opensuse.org/package/show/network/ddclient?expand=0&rev=43 --- ddclient.changes | 6 ++++++ ddclient.spec | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ddclient.changes b/ddclient.changes index ff7f936..f6ddc43 100644 --- a/ddclient.changes +++ b/ddclient.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:38:22 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Fri Feb 3 08:36:33 UTC 2017 - josef.moellers@suse.com diff --git a/ddclient.spec b/ddclient.spec index 7a070cb..8765a66 100644 --- a/ddclient.spec +++ b/ddclient.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: ddclient Summary: A Perl Client to Update Dynamic DNS Entries License: GPL-2.0+ @@ -92,8 +97,8 @@ mv sample-* examples %{__install} -D -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/init.d/%{name} %{__ln_s} %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} %endif -%{__install} -d -m 755 %{buildroot}/var/adm/fillup-templates -%{__install} -m 644 %{SOURCE2} %{buildroot}/var/adm/fillup-templates/sysconfig.%{name} +%{__install} -d -m 755 %{buildroot}%{_fillupdir} +%{__install} -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.%{name} %{__install} -d -m 755 %{buildroot}/var/cache/%{name} %if 0%{?has_systemd} %{__install} -d -m 755 %{buildroot}/run/%{name} @@ -151,7 +156,7 @@ fi %endif %{_sbindir}/%{name} %{_sbindir}/rc%{name} -/var/adm/fillup-templates/sysconfig.%{name} +%{_fillupdir}/sysconfig.%{name} %dir %attr(700,%{name},root) %{_localstatedir}/cache/%{name} %changelog