Accepting request 544752 from home:RBrownSUSE:branches:network:time

Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544752
OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=38
This commit is contained in:
Martin Pluskal 2017-11-23 15:11:48 +00:00 committed by Git OBS Bridge
parent 03c4ecbefc
commit 2f8a4c9f68
2 changed files with 13 additions and 2 deletions

View File

@ -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 Thu Oct 26 10:39:11 UTC 2017 - mpluskal@suse.com

View File

@ -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. %define vendorzone opensuse.
%global clknetsim_ver 71dbbc5 %global clknetsim_ver 71dbbc5
Name: chrony Name: chrony
@ -152,7 +157,7 @@ echo 'chronyd.service' > \
%{buildroot}%{_prefix}/lib/systemd/ntp-units.d/50-chronyd.list %{buildroot}%{_prefix}/lib/systemd/ntp-units.d/50-chronyd.list
install -Dpm 0644 %{SOURCE2} \ install -Dpm 0644 %{SOURCE2} \
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.chronyd %{buildroot}%{_fillupdir}/sysconfig.chronyd
install -Dpm 755 %{SOURCE4} \ install -Dpm 755 %{SOURCE4} \
%{buildroot}%{_datadir}/chrony-helper %{buildroot}%{_datadir}/chrony-helper
@ -200,7 +205,7 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/
%{_unitdir}/chrony*.service %{_unitdir}/chrony*.service
%{_unitdir}/chrony*.timer %{_unitdir}/chrony*.timer
%{_sbindir}/rcchrony* %{_sbindir}/rcchrony*
%{_localstatedir}/adm/fillup-templates/sysconfig.chronyd %{_fillupdir}/sysconfig.chronyd
%dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony %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/drift
%ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/rtc %ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/rtc