rpms/thunderbird
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix hunspell dictionary symlink when built for flatpak

Browse Source 
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.
This commit is contained in:
Kalev Lember 2019-03-02 11:06:06 +01:00
parent 832da56201
commit 74d7494df0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
thunderbird.spec
View File

@ -82,7 +82,7 @@
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 60.5.1 Version: 60.5.1
Release: 2%{?dist} Release: 3%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/ URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
@ -547,7 +547,7 @@ install -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir}
# Use the system hunspell dictionaries # Use the system hunspell dictionaries
%{__rm} -rf $RPM_BUILD_ROOT/%{mozappdir}/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 # ghost files
%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/components %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/components
@ -680,6 +680,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#=============================================================================== #===============================================================================
%changelog %changelog
* Sat Mar 02 2019 Kalev Lember <klember@redhat.com> - 60.5.1-3
- Fix hunspell dictionary symlink when built for flatpak
* Thu Feb 21 2019 Kalev Lember <klember@redhat.com> - 60.5.1-2 * Thu Feb 21 2019 Kalev Lember <klember@redhat.com> - 60.5.1-2
- Avoid hardcoding /usr in launcher scripts - Avoid hardcoding /usr in launcher scripts