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
parent d225a9a4
......@@ -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()
......
......@@ -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/*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment