diff --git a/build.py b/build.py index d05a7298408dd3713f2962793e8e48b369de12ba..971e4d868f2359f38d128cd3034827f53b4ce289 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 634b51dc5859792faacc8eca064a481f775555b1..d61e307cca7ef00c4b7631666b37ee1ecdbc84d4 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/*