packaging: Adjust following the relocation of the ringtones.

This is a follow up to the f0fb8148ba7f453d73e31e1cece2dcffae68e878
commit (Use the PROGSHAREDIR macro to refer to the custom datadir) in
the daemon, that moved the ringtones from a hard-coded location of
/usr/share/ring/ringtones to $datadir/jami/ringtones.

* packaging/rules/rpm/jami-daemon.spec (%files): Adjust accordingly.
* scripts/install.sh (client_cmake_flags) <DRINGTONE_DIR>: Likewise.

Change-Id: Ia9d3403f5600a4ab4eefe28ee20611afc3f5e8b0
parent 5c3c23d5
......@@ -105,7 +105,7 @@ rm -rfv %{buildroot}/%{_libdir}/*.la
# XXX: Use %%{_libexecdir}/jamid after there's no more OpenSUSE Leap
# < 16 (see https://en.opensuse.org/openSUSE:Specfile_guidelines).
/usr/libexec/jamid
%{_datadir}/ring/ringtones
%{_datadir}/jami/ringtones
%{_datadir}/dbus-1/services/*
%{_datadir}/dbus-1/interfaces/*
%doc %{_mandir}/man1/dring*
......
......@@ -183,7 +183,7 @@ else
else
client_cmake_flags+=(
-DCMAKE_INSTALL_PREFIX="${INSTALL}/${client}"
-DRINGTONE_DIR="${INSTALL}/daemon/share/ring/ringtones"
-DRINGTONE_DIR="${INSTALL}/daemon/share/jami/ringtones"
-DLibRingClient_DIR="${INSTALL}/lrc/lib/cmake/LibRingClient")
fi
fi
......
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