From 2d1186ce03cf42a9537bba401a523b867b0ef633c2f1612e85c27a459ac6bf52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 24 Nov 2017 07:06:44 +0000 Subject: [PATCH] Accepting request 544695 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/544695 OBS-URL: https://build.opensuse.org/package/show/Base:System/quota?expand=0&rev=50 --- quota.changes | 6 ++++++ quota.spec | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/quota.changes b/quota.changes index dcd3f95..3af74b5 100644 --- a/quota.changes +++ b/quota.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:41:35 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Mon Sep 4 10:51:57 UTC 2017 - tchvatal@suse.com diff --git a/quota.spec b/quota.spec index 90388d6..556181b 100644 --- a/quota.spec +++ b/quota.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: quota Version: 4.03 Release: 0 @@ -91,8 +96,8 @@ ln -s service %{buildroot}%{_sbindir}/rcquotad install -d -m 755 %{buildroot}%{_unitdir}/../scripts/ install -m 755 %{SOURCE3} %{buildroot}%{_unitdir}/../scripts/quotad_env.sh -install -d -m 755 %{buildroot}%{_localstatedir}/adm/fillup-templates -cp %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.nfs-quota +install -d -m 755 %{buildroot}%{_fillupdir} +cp %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.nfs-quota %find_lang %{name} @@ -141,7 +146,7 @@ cp %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.nfs-q %{_unitdir}/quotad.service %{_unitdir}/../scripts %{_unitdir}/../scripts/quotad_env.sh -%{_localstatedir}/adm/fillup-templates/sysconfig.nfs-quota +%{_fillupdir}/sysconfig.nfs-quota # these files conflicts with glibc rpm %exclude %{_includedir}/rpcsvc/*