From 189db2cfc986919fd276df5bef8bdb7ff0098cb02478575b74a027c5faf38e2e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 30 Nov 2017 11:44:59 +0000 Subject: [PATCH] Accepting request 546258 from Virtualization:containers OBS-URL: https://build.opensuse.org/request/show/546258 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/etcd?expand=0&rev=6 --- etcd.changes | 6 ++++++ etcd.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/etcd.changes b/etcd.changes index ce62059..f778c01 100644 --- a/etcd.changes +++ b/etcd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:48:13 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Wed Aug 30 10:49:23 UTC 2017 - vrothberg@suse.com diff --git a/etcd.spec b/etcd.spec index a36347d..c77c7b5 100644 --- a/etcd.spec +++ b/etcd.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: etcd Version: 3.2.4 Release: 0 @@ -76,7 +81,7 @@ install -d %{buildroot}/%{_sbindir} ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} # Sysconfig -install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} +install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.%{name} # Additional install -d -m 750 %{buildroot}%{_localstatedir}/lib/%{name} @@ -111,7 +116,7 @@ getent passwd %{name} >/dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_loca %{_sbindir}/rc%{name} # Sysconfig -%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} +%{_fillupdir}/sysconfig.%{name} # Additional %dir %attr(0750,%{name},%{name}) %{_localstatedir}/lib/%{name}