From 15dd42ec7943bc6df93a45fa83f1abf1d363595e Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
Date: Tue, 29 Jun 2021 11:36:36 -0400
Subject: [PATCH] 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
---
packaging/rules/rpm/jami-daemon.spec | 2 +-
scripts/install.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/packaging/rules/rpm/jami-daemon.spec b/packaging/rules/rpm/jami-daemon.spec
index 411029f4..ca5438e1 100644
--- a/packaging/rules/rpm/jami-daemon.spec
+++ b/packaging/rules/rpm/jami-daemon.spec
@@ -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*
diff --git a/scripts/install.sh b/scripts/install.sh
index 0481ac9e..5c2b8020 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -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
--
GitLab