Skip to content
Snippets Groups Projects
Unverified Commit 5c3c23d5 authored by Maxim Cournoyer's avatar Maxim Cournoyer
Browse files

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
parent 27be9f50
No related branches found
No related tags found
No related merge requests found
...@@ -473,7 +473,7 @@ def run_run(args): ...@@ -473,7 +473,7 @@ def run_run(args):
dring_log.write('=== Starting daemon (%s) ===' % dring_log.write('=== Starting daemon (%s) ===' %
time.strftime("%d/%m/%Y %H:%M:%S")) time.strftime("%d/%m/%Y %H:%M:%S"))
dring_process = subprocess.Popen( dring_process = subprocess.Popen(
["./install/daemon/libexec/dring", "-c", "-d"], ["./install/daemon/libexec/jamid", "-c", "-d"],
stdout=dring_log, stdout=dring_log,
stderr=dring_log stderr=dring_log
) )
...@@ -501,7 +501,7 @@ def run_run(args): ...@@ -501,7 +501,7 @@ def run_run(args):
f.write(str(client_process.pid)+'\n') f.write(str(client_process.pid)+'\n')
if args.debug: if args.debug:
subprocess.call(['gdb', './install/daemon/libexec/dring']) subprocess.call(['gdb', './install/daemon/libexec/jamid'])
if not args.background: if not args.background:
dring_process.wait() dring_process.wait()
......
...@@ -102,9 +102,9 @@ rm -rfv %{buildroot}/%{_libdir}/*.la ...@@ -102,9 +102,9 @@ rm -rfv %{buildroot}/%{_libdir}/*.la
%files %files
%defattr(-,root,root,-) %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). # < 16 (see https://en.opensuse.org/openSUSE:Specfile_guidelines).
/usr/libexec/dring /usr/libexec/jamid
%{_datadir}/ring/ringtones %{_datadir}/ring/ringtones
%{_datadir}/dbus-1/services/* %{_datadir}/dbus-1/services/*
%{_datadir}/dbus-1/interfaces/* %{_datadir}/dbus-1/interfaces/*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment