From 04a888cf71b0a27923990f1fc3198cc2cd246012 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 14:58:51 +0000 Subject: [PATCH] import UBI hunspell-en-0.20201207-11.el10 --- .gitignore | 4 +- hunspell-en-SI_and_IEC.patch | 26 ++- hunspell-en-buildfix.patch | 29 +++ hunspell-en-calender.patch | 21 --- hunspell-en-fixbuild.patch | 10 -- hunspell-en-irregular-plural-possessive.patch | 18 -- hunspell-en.spec | 166 +++++++++++++----- mozilla_words.patch | 73 +++----- perl.regex.patch | 22 --- sources | 2 +- 10 files changed, 201 insertions(+), 170 deletions(-) create mode 100644 hunspell-en-buildfix.patch delete mode 100644 hunspell-en-fixbuild.patch delete mode 100644 hunspell-en-irregular-plural-possessive.patch delete mode 100644 perl.regex.patch diff --git a/.gitignore b/.gitignore index b2eab21..0e4ac68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/en_GB.zip -/rel-2014.08.11.1.tar.gz +en_GB.zip +rel-2020.12.07.tar.gz diff --git a/hunspell-en-SI_and_IEC.patch b/hunspell-en-SI_and_IEC.patch index 60778da..ca4f124 100644 --- a/hunspell-en-SI_and_IEC.patch +++ b/hunspell-en-SI_and_IEC.patch @@ -1,9 +1,9 @@ --- scowl/r/special/abbreviations 2008-11-29 23:02:41.000000000 +0000 +++ scowl/r/special/abbreviations 2010-07-30 11:18:33.000000000 +0100 -@@ -3,6 +3,11 @@ - API - ATM - BTW +@@ -6,6 +6,11 @@ + DVR + DVR's + DVRs +EB +Eb +Ei @@ -12,7 +12,7 @@ EULA EULAs FAQ -@@ -16,39 +21,75 @@ +@@ -20,12 +25,17 @@ GIF GPU GUI @@ -25,19 +25,22 @@ HDMI HTML HTTP + IDE +IEC + IEEE IMHO IMNSHO - IMO +@@ -34,22 +44,41 @@ IRC ISO + ISS +JEDEC + JPEG +KB +Kb +Ki +KiB +Kib - JPEG MB MP3 MP3s @@ -55,10 +58,12 @@ +Pi +PiB +Pib + QA RFC ROFL RTFM SQL + Sep +TB +Tb +Ti @@ -66,7 +71,8 @@ +Tib URL USB - USB + UTC +@@ -57,11 +86,23 @@ WWW WYSIWYG XML @@ -81,10 +87,12 @@ +Zi +ZiB +Zib + bpm cf dpi + fMRI +kB +kb pp resp - vs + vols diff --git a/hunspell-en-buildfix.patch b/hunspell-en-buildfix.patch new file mode 100644 index 0000000..a6a6fb2 --- /dev/null +++ b/hunspell-en-buildfix.patch @@ -0,0 +1,29 @@ +--- wordlist-rel-2020.12.07/varcon/split 2022-09-20 10:51:01.659480534 +0100 ++++ wordlist-rel-2020.12.07/varcon/split 2022-09-20 10:50:55.565414190 +0100 +@@ -4,7 +4,6 @@ + use warnings; + use IO::Handle; + +-use lib '.'; + use varcon qw(%map $NUM_SP); + + $varcon::MAX_VARIANT_LEVEL = 3; +--- wordlist-rel-2020.12.07/varcon/w_variant 2022-09-20 11:11:26.393907205 +0100 ++++ wordlist-rel-2020.12.07/varcon/w_variant 2022-09-20 11:11:30.693955056 +0100 +@@ -4,7 +4,6 @@ + use warnings; + use IO::Handle; + +-use lib '.'; + use varcon qw(%map); + + my %F; +--- wordlist-rel-2020.12.07/varcon/make-variant 2022-09-20 11:30:49.892916137 +0100 ++++ wordlist-rel-2020.12.07/varcon/make-variant 2022-09-20 11:30:55.760982118 +0100 +@@ -1,6 +1,5 @@ + #!/usr/bin/perl + +-use lib '.'; + use varcon; + + sub add diff --git a/hunspell-en-calender.patch b/hunspell-en-calender.patch index 6f4fb89..d67387c 100644 --- a/hunspell-en-calender.patch +++ b/hunspell-en-calender.patch @@ -14,24 +14,3 @@ calibrate/SAGDN calibrater's calico/M ---- wordlist/alt12dicts/2of12full.txt 2011-02-08 11:55:46.478837084 +0000 -+++ wordlist/alt12dicts/2of12full.txt 2011-02-08 11:59:12.455202478 +0000 -@@ -6468,7 +6468,6 @@ - 12: 12 -# -& calendar - 2: 1 1# -& calendar month - 2: 1 1# -& calendar year -- 4: 4 -# -& calender - 12: 12 -# -& calf - 9: 8 1# -& calfskin - 3: 3 -# -& Calgary -diff -ru wordlist/alt12dicts/5desk.txt wordlist/alt12dicts/5desk.txt ---- wordlist/alt12dicts/5desk.txt 2011-02-08 11:55:46.548837888 +0000 -+++ wordlist/alt12dicts/5desk.txt 2011-02-08 11:58:55.162003701 +0000 -@@ -7353,7 +7353,6 @@ - Caledonia - Caledonian - calendar --calender - calendric - calendrical - calends diff --git a/hunspell-en-fixbuild.patch b/hunspell-en-fixbuild.patch deleted file mode 100644 index 577381f..0000000 --- a/hunspell-en-fixbuild.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -ru wordlist/scowl/src/deaccent.hh wordlist/scowl/src/deaccent.hh ---- wordlist/scowl/src/deaccent.hh -+++ wordlist/scowl/src/deaccent.hh -@@ -1,5 +1,5 @@ - --static const char deaccent_lookup[256] = { -+static const unsigned char deaccent_lookup[256] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, diff --git a/hunspell-en-irregular-plural-possessive.patch b/hunspell-en-irregular-plural-possessive.patch deleted file mode 100644 index f6f030d..0000000 --- a/hunspell-en-irregular-plural-possessive.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- wordlist.orig/scowl/src/add-affixes 2012-10-11 13:05:58.864864580 +0100 -+++ wordlist/scowl/src/add-affixes 2012-10-11 14:11:05.144908897 +0100 -@@ -74,6 +74,15 @@ - @a = grep {not $remove{"$w:$p:$_"}} @a; - next unless @a; - $lookup{$w} .= join("\n",@a)."\n"; -+ next unless $p eq 'N'; -+ -+ # For irregular nouns that have plurals that do not end in s -+ # then add the possessive form of the plural as well -+ foreach (@a) { -+ next unless (substr($_,-1,1) ne 's'); -+ $possessive{$_} = "$_\'s\n"; -+ $lookup{$w} .= $possessive{$_}; -+ } - } - - unless ($no_possessive) { diff --git a/hunspell-en.spec b/hunspell-en.spec index e9f24b3..e049a60 100644 --- a/hunspell-en.spec +++ b/hunspell-en.spec @@ -1,77 +1,93 @@ +%global dict_dirname hunspell Name: hunspell-en Summary: English hunspell dictionaries -%global upstreamid 20140811.1 +%global upstreamid 20201207 Version: 0.%{upstreamid} -Release: 12%{?dist} -Source0: https://github.com/en-wl/wordlist/archive/rel-2014.08.11.1.tar.gz +Release: 11%{?dist} +Source0: https://github.com/en-wl/wordlist/archive/rel-2020.12.07.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 Patch0: mozilla_words.patch Patch1: en_GB-singleletters.patch Patch2: en_GB.two_initial_caps.patch -#See http://sourceforge.net/tracker/?func=detail&aid=2355344&group_id=10079&atid=1014602 +#See https://github.com/en-wl/wordlist/issues/15 #filter removes words with "." in them Patch3: en_US-strippedabbrevs.patch -#See https://sourceforge.net/tracker/?func=detail&aid=2987192&group_id=143754&atid=756397 +#See https://sourceforge.net/p/hunspell/patches/35 #to allow "didn't" instead of suggesting change to typographical apostrophe Patch4: hunspell-en-allow-non-typographical.marks.patch -#See https://sourceforge.net/tracker/?func=detail&aid=3012183&group_id=10079&atid=1014602 #See https://bugzilla.redhat.com/show_bug.cgi?id=619577 add SI and IEC prefixes Patch5: hunspell-en-SI_and_IEC.patch -#See https://sourceforge.net/tracker/?func=detail&aid=3175662&group_id=10079&atid=1014602 obscure Calender hides misspelling of Calendar +#See https://github.com/en-wl/wordlist/issues/46 obscure Calender hides misspelling of Calendar Patch6: hunspell-en-calender.patch #valid English words that are archaic or rare in en-GB but not in en-IE Patch7: en_IE.supplemental.patch #call git to get the release hash, but this is a tarball Patch8: hunspell-en-dont-call-git-during-build.patch -#fix build -Patch9: hunspell-en-fixbuild.patch #rhbz#1492306 for better or worse treat etc the same in US and GB -Patch10: en_GB.etc.patch -#rhbz#1494968 perl tightened up regex rules -Patch11: perl.regex.patch +Patch9: en_GB.etc.patch +Patch10: hunspell-en-buildfix.patch URL: http://wordlist.sourceforge.net/ -License: LGPLv2+ and LGPLv2 and BSD +# README_en_GB.txt has specified just LGPL which mean LGPLv2+ +# scowl/speller/aspell/en_affix.dat is BSD +# scowl/speller/aspell/en_phonet.dat is LGPLv2 +License: LGPL-2.1-or-later AND LGPL-2.1-only AND BSD-3-Clause-Modification BuildArch: noarch -BuildRequires: aspell, zip, dos2unix, perl-Getopt-Long -Requires: hunspell +BuildRequires: aspell, zip, dos2unix, perl-Getopt-Long, gcc-c++ +BuildRequires: make Requires: hunspell-en-US = %{version}-%{release} Requires: hunspell-en-GB = %{version}-%{release} -Supplements: (hunspell and langpacks-en) +%if 0%{?rhel} +Requires: hunspell +%else +Supplements: (hunspell or nuspell) +%endif +Supplements: langpacks-en %description English (US, UK, etc.) hunspell dictionaries %package US +Requires: hunspell-filesystem +%if 0%{?rhel} Requires: hunspell +%else +Recommends: (hunspell or nuspell) +%endif Summary: US English hunspell dictionaries %description US US English hunspell dictionaries %package GB +Requires: hunspell-filesystem +%if 0%{?rhel} Requires: hunspell -Supplements: (hunspell and langpacks-en_GB) +Supplements: hunspell +%else +Recommends: (hunspell or nuspell) +Supplements: (hunspell or nuspell) +%endif +Supplements: langpacks-en_GB Summary: UK English hunspell dictionaries %description GB UK English hunspell dictionaries %prep -%setup -q -n wordlist-rel-2014.08.11.1 -%setup -q -T -D -a 1 -n wordlist-rel-2014.08.11.1 -%patch0 -p0 -b .mozilla -%patch1 -p1 -b .singleletters -%patch2 -p1 -b .two_initial_cap -%patch3 -p0 -b .strippedabbrevs -%patch4 -p0 -b .allow-non-typographical -%patch5 -p0 -b .SI_and_IEC -%patch6 -p1 -b .calender -%patch7 -p1 -b .en_IE -%patch8 -p1 -b .nogit -%patch9 -p1 -b .fixbuild -%patch10 -p1 -b .etc -%patch11 -p1 -b .regex +%setup -q -n wordlist-rel-2020.12.07 +%setup -q -T -D -a 1 -n wordlist-rel-2020.12.07 +%patch -P 0 -p0 -b .mozilla +%patch -P 1 -p1 -b .singleletters +%patch -P 2 -p1 -b .two_initial_cap +%patch -P 3 -p0 -b .strippedabbrevs +%patch -P 4 -p0 -b .allow-non-typographical +%patch -P 5 -p0 -b .SI_and_IEC +%patch -P 6 -p1 -b .calender +%patch -P 7 -p1 -b .en_IE +%patch -P 8 -p1 -b .nogit +%patch -P 9 -p1 -b .etc +%patch -P 10 -p1 -b .buildfix %build export PERL5LIB=`pwd`/scowl/r/varcon${PERL5LIB:+:${PERL5LIB}} @@ -90,13 +106,13 @@ 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/ -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" +pushd $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}/ +en_GB_aliases="en_AG 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 ln -s en_GB.dic $lang.dic @@ -111,19 +127,87 @@ 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 +* Tue Oct 29 2024 Troy Dawson - 0.20201207-11 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 0.20201207-10 +- Bump release for June 2024 mass rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 0.20201207-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 0.20201207-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 0.20201207-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jul 05 2023 Gwyn Ciesla - 0.20201207-6 +- Temporarily revert to aspell. + +* Wed Jun 28 2023 Gwyn Ciesla - 0.20201207-5 +- Move BR from aspell to hunspell. + +* Wed Feb 22 2023 Caolán McNamara - 0.20201207-4 +- migrated to SPDX license + +* Thu Jan 19 2023 Fedora Release Engineering - 0.20201207-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Dec 07 2022 Caolán McNamara - 0.20201207-2 +- use dict_dirname of hunspell for future rhel, etc. + +* Tue Sep 20 2022 Caolán McNamara - 0.20201207-1 +- latest en-US version + +* Thu Jul 21 2022 Fedora Release Engineering - 0.20140811.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* 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 + +* Thu Jul 22 2021 Fedora Release Engineering - 0.20140811.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Feb 03 2021 Peter Oliver - 0.20140811.1-19 +- Accomodate Nuspell. + +* Tue Jan 26 2021 Fedora Release Engineering - 0.20140811.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.20140811.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.20140811.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 0.20140811.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0.20140811.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.20140811.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Jul 08 2018 Parag Nemade - 0.20140811.1-12 - Update Source tag diff --git a/mozilla_words.patch b/mozilla_words.patch index 5838f40..2b65ade 100644 --- a/mozilla_words.patch +++ b/mozilla_words.patch @@ -1,66 +1,47 @@ --- scowl/r/special/proper-names 2008-02-08 11:53:27.000000000 +0000 +++ scowl/r/special/proper-names 2008-02-08 12:06:00.000000000 +0000 -@@ -8,6 +8,8 @@ - BitTorrent - Bluetooth +@@ -18,7 +18,9 @@ Bugzilla + CSS + CVS +Camino + Celgene +ChatZilla + Clojure Closure - Debian - Dropbox -@@ -19,23 +21,28 @@ - GNU - Gentoo + Cordova +@@ -45,6 +47,7 @@ GitHub + HBase + Hadoop +Haskell + Heroku Hunspell - ISO - Instagram - Ispell + Hurd +@@ -55,11 +58,13 @@ + Kotlin LibreOffice LyX +Mandriva + MariaDB + Matlab + Memcached + MongoDB Mozilla +MySpell + MySQL NSA - Netflix - OpenOffice - PayPal - PowerPC - Roku -+SeaMonkey - SUSE + NVIDIA +@@ -83,10 +88,12 @@ + SVN + Salesforce Scala ++SeaMonkey + Seeger + SharePoint Slackware Sourceforge +Sunbird + TensorFlow Thunderbird - Twitter - Ubuntu ---- scowl/speller/en.aff 2008-02-08 20:28:24.000000000 +0000 -+++ scowl/speller/en.aff 2008-02-08 20:28:45.000000000 +0000 -@@ -110,13 +110,17 @@ - SFX L Y 1 - SFX L 0 ment . - --REP 88 -+SFX i N 1 -+SFX i us i us -+ -+REP 90 - REP a ei - REP ei a - REP a ey - REP ey a - REP ai ie - REP ie ai -+REP alot a_lot - REP are air - REP are ear - REP are eir -@@ -199,3 +203,4 @@ - REP shun tion - REP shun sion - REP shun cion -+REP sitted sat + Troilus diff --git a/perl.regex.patch b/perl.regex.patch deleted file mode 100644 index e8086cd..0000000 --- a/perl.regex.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/scowl/src/add-affixes 2017-09-25 11:58:46.898706402 +0100 -+++ b/scowl/src/add-affixes 2017-09-25 11:59:46.952904766 +0100 -@@ -72,7 +72,7 @@ - next unless $q eq '' || $use_all >= 2; - my @a = split /, | \| /, $a; - @a = grep {my ($word,$tags,$level) -- = /^([A-Za-z\']+)([~= 3; # insert placeholder - @a = (); - foreach (@a0) { -- s/ {.+?}//g; s/ \(.+?\)//g; -+ s/ \{.+?\}//g; s/ \(.+?\)//g; - s/ \| / /g; s/ \/ / /g; - push @a, (split / /, $_); - } diff --git a/sources b/sources index 6660e2f..5c9fe00 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (en_GB.zip) = c9ae9709a1a53eb0fe1e3968a979b5754f5335bcb24ffc1cbd0e569fa595cc84dba02943a081c4dadbb159b5e9572268eddca8b0a6ceaf460e3545ceeac5e556 -SHA512 (rel-2014.08.11.1.tar.gz) = cff8ba0a457c85f581bb1f0dbe7ea3a269a1f8c06ec73155de2744a5bf5a4ff0e249f5748fae073bc0b5b666e4a01b15135e7107c0a5e980ec84237d6b07c306 +SHA512 (rel-2020.12.07.tar.gz) = 8f98f9d081d968ca0ebad88db4f596baf78ccb541785b10f4d2f6b7748b643a10b2c8d9d23d6c5fba64e0a51442a05e108962c0cd0efb3fb98dbf941802f6449