Accepting request 824482 from home:gmbr3:libexecdir

- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075)

OBS-URL: https://build.opensuse.org/request/show/824482
OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=87
This commit is contained in:
Martin Pluskal 2020-08-10 06:14:10 +00:00 committed by Git OBS Bridge
parent 606c5dd576
commit 694ca9de6c
4 changed files with 9 additions and 2 deletions

View File

@ -5,4 +5,4 @@ Wants=network-online.target
[Service]
Type=oneshot
ExecStart=/usr/lib/chrony/helper update-dnssrv-servers %I
ExecStart=@LIBEXECDIR@/chrony/helper update-dnssrv-servers %I

View File

@ -5,7 +5,7 @@ diff -burNE chrony-3.5_orig/examples/chronyd.service chrony-3.5/examples/chronyd
PIDFile=/run/chrony/chronyd.pid
EnvironmentFile=-/etc/sysconfig/chronyd
ExecStart=/usr/sbin/chronyd $OPTIONS
+ExecStartPost=/usr/lib/chrony/helper update-daemon
+ExecStartPost=@LIBEXECDIR@/chrony/helper update-daemon
PrivateTmp=yes
ProtectHome=yes
ProtectSystem=full

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Aug 2 21:27:45 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075)
-------------------------------------------------------------------
Thu Jun 4 15:23:17 UTC 2020 - Reinhard Max <max@suse.com>

View File

@ -143,6 +143,7 @@ e.g. because the servers will be set via DHCP.
%prep
%setup -q -a 10
%patch0 -p1
sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{PATCH1}
%patch1 -p1
%patch2 -p1
%patch3
@ -200,6 +201,7 @@ install -Dpm 0644 examples/chronyd.service \
%{buildroot}%{_unitdir}/chronyd.service
install -Dpm 0644 examples/chrony-wait.service \
%{buildroot}%{_unitdir}/chrony-wait.service
sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE5}
install -Dpm 0644 %{SOURCE5} \
%{buildroot}%{_unitdir}/chrony-dnssrv@.service
install -Dpm 0644 %{SOURCE6} \