From be48ac780734ac25983d3f321c51bf564bf87cbafc30ab47e035e11ef38d9038 Mon Sep 17 00:00:00 2001 From: Malcolm Lewis Date: Thu, 23 Nov 2017 15:06:00 +0000 Subject: [PATCH] Accepting request 544740 from home:RBrownSUSE:branches:network:utilities Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544740 OBS-URL: https://build.opensuse.org/package/show/network:utilities/iodine?expand=0&rev=11 --- iodine.changes | 6 ++++++ iodine.spec | 15 ++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/iodine.changes b/iodine.changes index b271020..6d2397a 100644 --- a/iodine.changes +++ b/iodine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:45:54 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Mon Mar 13 00:54:38 UTC 2017 - malcolmlewis@opensuse.org diff --git a/iodine.spec b/iodine.spec index f66bb87..ca1da23 100644 --- a/iodine.spec +++ b/iodine.spec @@ -17,6 +17,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: iodine Version: 0.7.0 Release: 0 @@ -55,11 +60,11 @@ make install PREFIX=%{buildroot}%{_prefix} # Install client files mkdir -p %{buildroot}%{_unitdir} install -m 0644 %{S:1} %{buildroot}%{_unitdir}/ -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates -install -m 0644 %{S:2} %{buildroot}%{_localstatedir}/adm/fillup-templates/ +mkdir -p %{buildroot}%{_fillupdir} +install -m 0644 %{S:2} %{buildroot}%{_fillupdir}/ # Install server files install -m 0644 %{S:3} %{buildroot}%{_unitdir}/ -install -m 0644 %{S:4} %{buildroot}%{_localstatedir}/adm/fillup-templates/ +install -m 0644 %{S:4} %{buildroot}%{_fillupdir}/ # Copy common man page to avoid warning pushd %{buildroot}%{_mandir}/man8/ cp %{name}.8 %{name}d.8 @@ -94,8 +99,8 @@ ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rciodined %doc CHANGELOG README TODO %{_sbindir}/%{name} %{_sbindir}/%{name}d -%{_localstatedir}/adm/fillup-templates/sysconfig.iodine -%{_localstatedir}/adm/fillup-templates/sysconfig.iodined +%{_fillupdir}/sysconfig.iodine +%{_fillupdir}/sysconfig.iodined %{_sbindir}/rciodine %{_sbindir}/rciodined %{_unitdir}/iodine.service