From 5c3c23d553cb1da078775a3dd8b4635731a153ca Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
Date: Wed, 7 Apr 2021 13:58:13 -0400
Subject: [PATCH] packaging: Adjust for the 'dring' command renaming.
* build.py (run_run) <dring>: Adjust file name.
* packaging/rules/rpm/jami-daemon.spec (%install): Likewise.
Change-Id: Iedc4e0803bda19d139b29a4ccc669dcc8cc3fb9f
---
build.py | 4 ++--
packaging/rules/rpm/jami-daemon.spec | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.py b/build.py
index 971e4d86..6a40f1db 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/libexec/dring", "-c", "-d"],
+ ["./install/daemon/libexec/jamid", "-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/libexec/dring'])
+ subprocess.call(['gdb', './install/daemon/libexec/jamid'])
if not args.background:
dring_process.wait()
diff --git a/packaging/rules/rpm/jami-daemon.spec b/packaging/rules/rpm/jami-daemon.spec
index d61e307c..411029f4 100644
--- a/packaging/rules/rpm/jami-daemon.spec
+++ b/packaging/rules/rpm/jami-daemon.spec
@@ -102,9 +102,9 @@ rm -rfv %{buildroot}/%{_libdir}/*.la
%files
%defattr(-,root,root,-)
-# XXX: Use %%{_libexecdir}/dring after there's no more OpenSUSE Leap
+# XXX: Use %%{_libexecdir}/jamid after there's no more OpenSUSE Leap
# < 16 (see https://en.opensuse.org/openSUSE:Specfile_guidelines).
-/usr/libexec/dring
+/usr/libexec/jamid
%{_datadir}/ring/ringtones
%{_datadir}/dbus-1/services/*
%{_datadir}/dbus-1/interfaces/*
--
GitLab