Accepting request 1000645 from home:schubi2
- Moved logrotate files from user specific directory /etc/logrotate.d to vendor specific directory /usr/etc/logrotate.d. OBS-URL: https://build.opensuse.org/request/show/1000645 OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=110
This commit is contained in:
parent
acb5dc1c55
commit
973a6028ca
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 15 14:41:05 UTC 2022 - Stefan Schubert <schubi@suse.com>
|
||||
|
||||
- Moved logrotate files from user specific directory /etc/logrotate.d
|
||||
to vendor specific directory /usr/etc/logrotate.d.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 12 14:33:50 UTC 2022 - Stefan Schubert <schubi@suse.de>
|
||||
|
||||
|
24
chrony.spec
24
chrony.spec
@ -231,8 +231,14 @@ install -Dpm 0755 examples/chrony.nm-dispatcher.onoffline \
|
||||
%{buildroot}%{_prefix}/lib/NetworkManager/dispatcher.d/20-chrony
|
||||
install -Dpm 0755 %{SOURCE3} \
|
||||
%{buildroot}%{_sysconfdir}/dhcp/dhclient.d/chrony.sh
|
||||
%if 0%{?suse_version} > 1500
|
||||
mkdir -p %{buildroot}%{_distconfdir}/logrotate.d
|
||||
install -Dpm 0644 examples/chrony.logrotate \
|
||||
%{buildroot}%{_distconfdir}/logrotate.d/chrony
|
||||
%else
|
||||
install -Dpm 0644 examples/chrony.logrotate \
|
||||
%{buildroot}%{_sysconfdir}/logrotate.d/chrony
|
||||
%endif
|
||||
install -Dpm 0644 examples/chronyd.service \
|
||||
%{buildroot}%{_unitdir}/chronyd.service
|
||||
install -Dpm 0644 examples/chrony-wait.service \
|
||||
@ -286,6 +292,20 @@ make %{?_smp_mflags} check
|
||||
|
||||
%pre -f chrony.pre
|
||||
%service_add_pre chronyd.service chrony-wait.service
|
||||
%if 0%{?suse_version} > 1500
|
||||
# Prepare for migration to /usr/etc; save any old .rpmsave
|
||||
for i in logrotate.d/chrony ; do
|
||||
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
|
||||
done
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1500
|
||||
%posttrans
|
||||
# Migration to /usr/etc, restore just created .rpmsave
|
||||
for i in logrotate.d/chrony ; do
|
||||
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
|
||||
done
|
||||
%endif
|
||||
|
||||
%preun
|
||||
%service_del_preun chronyd.service chrony-wait.service
|
||||
@ -309,7 +329,11 @@ make %{?_smp_mflags} check
|
||||
%doc examples
|
||||
%config(noreplace) %attr(0640,root,%{name}) %{_sysconfdir}/chrony.conf
|
||||
%config(noreplace) %attr(0640,root,%{name}) %verify(not md5 size mtime) %{_sysconfdir}/chrony.keys
|
||||
%if 0%{?suse_version} > 1500
|
||||
%{_distconfdir}/logrotate.d/chrony
|
||||
%else
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/chrony
|
||||
%endif
|
||||
%attr(0755,root,root) %{_prefix}/lib/NetworkManager/dispatcher.d/20-chrony
|
||||
%dir %{_sysconfdir}/chrony.d/
|
||||
%dir %{_sysconfdir}/dhcp/
|
||||
|
Loading…
Reference in New Issue
Block a user