Accepting request 947490 from network:time
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/947490 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/chrony?expand=0&rev=35
This commit is contained in:
commit
b2f27e4b5f
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 10 17:26:02 UTC 2022 - Reinhard Max <max@suse.com>
|
||||
|
||||
- boo#1194206: Use /run instead of /var/run throughout.
|
||||
- bsc#1194229: Fix pool package dependencies, so that SLE actually
|
||||
prefers chrony-pool-suse over chrony-pool-empty.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 16 16:47:08 UTC 2021 - Reinhard Max <max@suse.com>
|
||||
|
||||
|
@ -5,11 +5,11 @@
|
||||
# records are updated here using the dig utility.
|
||||
|
||||
chronyc=/usr/bin/chronyc
|
||||
helper_dir=/var/run/chrony-helper
|
||||
helper_dir=@CHRONY_RUNDIR@/chrony-helper
|
||||
added_servers_file=$helper_dir/added_servers
|
||||
|
||||
network_sysconfig_file=/etc/sysconfig/network
|
||||
dhclient_servers_files=/var/run/netconfig/chrony.servers
|
||||
dhclient_servers_files=/run/netconfig/chrony.servers
|
||||
dnssrv_servers_files=$helper_dir/dnssrv@*
|
||||
dnssrv_timer_prefix=chrony-dnssrv@
|
||||
|
||||
|
12
chrony.spec
12
chrony.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package chrony
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -36,6 +36,7 @@
|
||||
%define _fillupdir %{_localstatedir}/adm/fillup-templates
|
||||
%endif
|
||||
%define chrony_helper %{_libexecdir}/chrony/helper
|
||||
%define chrony_rundir %{_rundir}/%{name}
|
||||
Name: chrony
|
||||
Version: 4.2
|
||||
Release: 0
|
||||
@ -130,6 +131,7 @@ Provides: %name-pool-nonempty
|
||||
Conflicts: %name-pool
|
||||
Requires: %name = %version
|
||||
BuildArch: noarch
|
||||
Supplements: (chrony and branding-SLE)
|
||||
Removepathpostfixes:.suse
|
||||
|
||||
%description pool-suse
|
||||
@ -158,7 +160,6 @@ Provides: %name-pool = %version
|
||||
Conflicts: %name-pool
|
||||
Requires: %name = %version
|
||||
BuildArch: noarch
|
||||
Supplements: (chrony and branding-SLE)
|
||||
Removepathpostfixes:.empty
|
||||
|
||||
%description pool-empty
|
||||
@ -201,6 +202,8 @@ export CFLAGS="%{optflags} -Wall -fpic -DPIC $(pkg-config --cflags libseccomp)"
|
||||
export LDFLAGS="-pie -Wl,-z,relro,-z,now"
|
||||
%configure \
|
||||
--docdir="%{_docdir}/%{name}" \
|
||||
--chronyrundir=%{chrony_rundir} \
|
||||
--with-pidfile=%{chrony_rundir}/chronyd.pid \
|
||||
--enable-scfilter \
|
||||
--with-user=chrony \
|
||||
--with-hwclockfile=%{_sysconfdir}/adjtime \
|
||||
@ -265,7 +268,10 @@ echo '# Add ntp pools here' > %{buildroot}/etc/chrony.d/pool.conf.empty
|
||||
mkdir -p %{buildroot}%{_sysusersdir}
|
||||
install -m 0644 %{SOURCE14} %{buildroot}%{_sysusersdir}/
|
||||
|
||||
find %{buildroot} -type f | xargs sed -i 's-@CHRONY_HELPER@-%{chrony_helper}-g'
|
||||
find %{buildroot} -type f | xargs sed -i '
|
||||
s-@CHRONY_HELPER@-%{chrony_helper}-g
|
||||
s-@CHRONY_RUNDIR@-%{chrony_rundir}-g
|
||||
'
|
||||
|
||||
%if %{with testsuite}
|
||||
%ifnarch %ix86
|
||||
|
Loading…
Reference in New Issue
Block a user