diff --git a/hunspell-en.spec b/hunspell-en.spec index 038fe39..322de8d 100644 --- a/hunspell-en.spec +++ b/hunspell-en.spec @@ -1,8 +1,13 @@ +%if 0%{?fedora} > 35 +%global dict_dirname hunspell +%else +%global dict_dirname myspell +%endif Name: hunspell-en Summary: English hunspell dictionaries %global upstreamid 20140811.1 Version: 0.%{upstreamid} -Release: 21%{?dist} +Release: 22%{?dist} Source0: https://github.com/en-wl/wordlist/archive/rel-2014.08.11.1.tar.gz Source1: http://download.services.openoffice.org/contrib/dictionaries/en_GB.zip #See http://mxr.mozilla.org/mozilla/source/extensions/spellcheck/locales/en-US/hunspell/mozilla_words.diff?raw=1 @@ -110,12 +115,12 @@ for i in README_en_CA.txt README_en_US.txt; do done %install -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell -cp -p en_??.dic en_??.aff $RPM_BUILD_ROOT/%{_datadir}/myspell +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname} +cp -p en_??.dic en_??.aff $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname} cd scowl/speller -cp -p en_??.dic en_??.aff $RPM_BUILD_ROOT/%{_datadir}/myspell +cp -p en_??.dic en_??.aff $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname} -pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/ +pushd $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}/ en_GB_aliases="en_AG en_AU en_BS en_BW en_BZ en_DK en_GH en_HK en_IE en_IN en_JM en_MW en_NA en_NG en_NZ en_SG en_TT en_ZA en_ZM en_ZW" for lang in $en_GB_aliases; do ln -s en_GB.aff $lang.aff @@ -131,19 +136,23 @@ popd %files %doc scowl/speller/README_en_CA.txt -%{_datadir}/myspell/* -%exclude %{_datadir}/myspell/en_GB.* -%exclude %{_datadir}/myspell/en_US.* +%{_datadir}/%{dict_dirname}/* +%exclude %{_datadir}/%{dict_dirname}/en_GB.* +%exclude %{_datadir}/%{dict_dirname}/en_US.* %files US %doc scowl/speller/README_en_US.txt -%{_datadir}/myspell/en_US.* +%{_datadir}/%{dict_dirname}/en_US.* %files GB %doc README_en_GB.txt -%{_datadir}/myspell/en_GB.* +%{_datadir}/%{dict_dirname}/en_GB.* %changelog +* Fri Jan 21 2022 Vishal Vijayraghavan - 0.20140811.1-22 +- rename install directory name from myspell to hunspell +- https://fedoraproject.org/wiki/Changes/Hunspell_dictionary_dir_change + * Thu Jan 20 2022 Fedora Release Engineering - 0.20140811.1-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild