From 694ca9de6c4e77c1ca86ea4149ef218ee357545e5c02d7a76e531524de905d58 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Mon, 10 Aug 2020 06:14:10 +0000
Subject: [PATCH] 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
---
 chrony-dnssrv@.service      | 2 +-
 chrony-service-helper.patch | 2 +-
 chrony.changes              | 5 +++++
 chrony.spec                 | 2 ++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/chrony-dnssrv@.service b/chrony-dnssrv@.service
index 48a8358..05d4094 100644
--- a/chrony-dnssrv@.service
+++ b/chrony-dnssrv@.service
@@ -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
diff --git a/chrony-service-helper.patch b/chrony-service-helper.patch
index 0f9c63b..1275338 100644
--- a/chrony-service-helper.patch
+++ b/chrony-service-helper.patch
@@ -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
diff --git a/chrony.changes b/chrony.changes
index fa49964..f95b5a5 100644
--- a/chrony.changes
+++ b/chrony.changes
@@ -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>
 
diff --git a/chrony.spec b/chrony.spec
index ffa5422..83fdcc2 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -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} \