From b5b981b79be5fe940c24681b77f787a79e7bcd21fd6bda56f1e51f5005901c57 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Fri, 24 Nov 2017 07:04:30 +0000 Subject: [PATCH] Accepting request 544680 from home:RBrownSUSE:branches:Base:System Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544680 OBS-URL: https://build.opensuse.org/package/show/Base:System/fillup?expand=0&rev=24 --- fillup.changes | 6 ++++++ fillup.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/fillup.changes b/fillup.changes index 2754220..e64398d 100644 --- a/fillup.changes +++ b/fillup.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:39:57 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Mon Nov 3 13:09:25 UTC 2014 - tchvatal@suse.com diff --git a/fillup.spec b/fillup.spec index 7af371c..cf8c4c4 100644 --- a/fillup.spec +++ b/fillup.spec @@ -1,7 +1,7 @@ # # spec file for package fillup # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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: fillup Version: 1.42 Release: 0 @@ -52,7 +57,7 @@ its variable name. make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="%{optflags}" %install -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +mkdir -p %{buildroot}%{_fillupdir} install -d -m 755 %{buildroot}/%{_bindir} install -m 755 BIN/fillup %{buildroot}/%{_bindir} install -d %{buildroot}/%{_mandir}/man8