From 7138430e17dcf1190599470e6e5a9467d5fb9986 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
Date: Fri, 25 Jun 2021 11:29:12 -0400
Subject: [PATCH] packaging: Adjust jami-daemon.spec to use libexec.
This follows commit 2afa99fd1 in the daemon.
* build.py (run_run) <dring>: Adjust file name.
* packaging/rules/rpm/jami-daemon.spec (%install): Likewise. Hard
code the jamid binary location as /usr/libexec/dring, to not argue
with OpenSUSE Leap's %{_libexecdir}.
Change-Id: Iea6bf3cc6c4dce853f0b7c92861dfee7b8a07bbe
---
build.py | 4 ++--
packaging/rules/rpm/jami-daemon.spec | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/build.py b/build.py
index d05a7298..971e4d86 100755
--- a/build.py
+++ b/build.py
@@ -473,7 +473,7 @@ def run_run(args):
dring_log.write('=== Starting daemon (%s) ===' %
time.strftime("%d/%m/%Y %H:%M:%S"))
dring_process = subprocess.Popen(
- ["./install/daemon/lib/ring/dring", "-c", "-d"],
+ ["./install/daemon/libexec/dring", "-c", "-d"],
stdout=dring_log,
stderr=dring_log
)
@@ -501,7 +501,7 @@ def run_run(args):
f.write(str(client_process.pid)+'\n')
if args.debug:
- subprocess.call(['gdb', './install/daemon/lib/ring/dring'])
+ subprocess.call(['gdb', './install/daemon/libexec/dring'])
if not args.background:
dring_process.wait()
diff --git a/packaging/rules/rpm/jami-daemon.spec b/packaging/rules/rpm/jami-daemon.spec
index 634b51dc..d61e307c 100644
--- a/packaging/rules/rpm/jami-daemon.spec
+++ b/packaging/rules/rpm/jami-daemon.spec
@@ -102,7 +102,9 @@ rm -rfv %{buildroot}/%{_libdir}/*.la
%files
%defattr(-,root,root,-)
-%{_libdir}/ring/dring
+# XXX: Use %%{_libexecdir}/dring after there's no more OpenSUSE Leap
+# < 16 (see https://en.opensuse.org/openSUSE:Specfile_guidelines).
+/usr/libexec/dring
%{_datadir}/ring/ringtones
%{_datadir}/dbus-1/services/*
%{_datadir}/dbus-1/interfaces/*
--
GitLab