From 74d7494df06290561280cdb44e0c064b906a1607 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 Mar 2019 11:06:06 +0100 Subject: [PATCH] Fix hunspell dictionary symlink when built for flatpak We can't assume that the prefix where thunderbird is installed is the same where hunspell is: when building for flatpak, thunderbird is in /app, but hunspell dictionaries are in /usr. Fix this by asking hunspell pkg-config file where it is installed, instead of assuming it's in the same prefix as thunderbird. --- thunderbird.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/thunderbird.spec b/thunderbird.spec index 3126bc0..3b78f70 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -82,7 +82,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 60.5.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -547,7 +547,7 @@ install -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir} # Use the system hunspell dictionaries %{__rm} -rf $RPM_BUILD_ROOT/%{mozappdir}/dictionaries -ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{mozappdir}/dictionaries +ln -s $(pkg-config --variable prefix hunspell)/share/myspell $RPM_BUILD_ROOT%{mozappdir}/dictionaries # ghost files %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/components @@ -680,6 +680,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Sat Mar 02 2019 Kalev Lember - 60.5.1-3 +- Fix hunspell dictionary symlink when built for flatpak + * Thu Feb 21 2019 Kalev Lember - 60.5.1-2 - Avoid hardcoding /usr in launcher scripts