diff --git a/chrony.changes b/chrony.changes index 13eb6ce..4cd6e65 100644 --- a/chrony.changes +++ b/chrony.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:47:05 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Thu Oct 26 10:39:11 UTC 2017 - mpluskal@suse.com diff --git a/chrony.spec b/chrony.spec index c64c642..15aad46 100644 --- a/chrony.spec +++ b/chrony.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 + %define vendorzone opensuse. %global clknetsim_ver 71dbbc5 Name: chrony @@ -152,7 +157,7 @@ echo 'chronyd.service' > \ %{buildroot}%{_prefix}/lib/systemd/ntp-units.d/50-chronyd.list install -Dpm 0644 %{SOURCE2} \ - %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.chronyd + %{buildroot}%{_fillupdir}/sysconfig.chronyd install -Dpm 755 %{SOURCE4} \ %{buildroot}%{_datadir}/chrony-helper @@ -200,7 +205,7 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/ %{_unitdir}/chrony*.service %{_unitdir}/chrony*.timer %{_sbindir}/rcchrony* -%{_localstatedir}/adm/fillup-templates/sysconfig.chronyd +%{_fillupdir}/sysconfig.chronyd %dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony %ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/drift %ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/rtc