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/*