diff --git a/en_GB-singleletters.patch b/en_GB-singleletters.patch deleted file mode 100644 index 014929a..0000000 --- a/en_GB-singleletters.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- wordlist.orig/en_GB.dic 2005-05-26 11:49:30.000000000 +0100 -+++ wordlist/en_GB.dic 2008-11-28 10:01:37.000000000 +0000 -@@ -1,4 +1,4 @@ --46280 -+46286 - abaft - abbreviation/M - abdicate/DNGSn -@@ -2278,6 +2278,7 @@ - hysterectomy/SM - Hyundai/M - ICC/M -+i - icebox/SM - icicle/SM - iconoclasm/MS -@@ -2470,6 +2471,7 @@ - Ithacan - its - ix -+j - jackknife/DGMS - Jacqueline - Jaeger/M -@@ -2764,6 +2766,7 @@ - Mabel/M - Macedon - Macedonia/M -+m - macintosh/SM - MacIntyre - Mackenzie -@@ -3222,6 +3225,7 @@ - nuttiness/S - nymphomaniac/S - Oakland/M -+o - ob. - obeyer/EM - obfuscation/M -@@ -4797,6 +4801,7 @@ - tyro/SM - UFO/S - Ukrainian/S -+u - ulcerate/SGNDn - ulcerous - Ulrika/M -@@ -4962,6 +4967,7 @@ - vulnerability/SI - vulva/M - WAC -+w - wagon/SM - waitress/MS - Waldemar/M diff --git a/en_GB.etc.patch b/en_GB.etc.patch deleted file mode 100644 index dff0ffd..0000000 --- a/en_GB.etc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wordlist.orig/en_GB.dic 2017-09-21 11:24:10.673817684 +0100 -+++ wordlist/en_GB.dic 2017-09-21 11:31:39.596987079 +0100 -@@ -27307,7 +27307,7 @@ - estimations/f - estrange/DGLS - estranger/M --etc. -+etc - eternal/PY - ethereal/PY - ethic/3MSY diff --git a/en_GB.two_initial_caps.patch b/en_GB.two_initial_caps.patch deleted file mode 100644 index e513944..0000000 --- a/en_GB.two_initial_caps.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- wordlist.orig/en_GB.dic 2009-06-06 15:16:16.000000000 +0100 -+++ wordlist/en_GB.dic 2009-06-06 15:17:28.000000000 +0100 -@@ -19953,7 +19953,7 @@ - technology/3wSM1 - Ted/M - tee/SGdM --TEirtza/M -+Teirtza/M - tellurium/M - temp/GMRSTD - tempera/MLS -@@ -41226,7 +41226,7 @@ - adore/lRSNnGkD - Adrian/M - adroit/TYP --ADte -+ADTe - adulterer/SM - adumbration/M - advantageousness/E diff --git a/en_GB.zip b/en_GB.zip deleted file mode 100644 index 7be8f8d..0000000 Binary files a/en_GB.zip and /dev/null differ diff --git a/en_IE.supplemental.patch b/en_IE.supplemental.patch deleted file mode 100644 index 25a5497..0000000 --- a/en_IE.supplemental.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- wordlist/en_GB.dic.orig 2012-04-10 22:51:16.471732570 +0100 -+++ wordlist/en_GB.dic 2012-04-10 22:55:00.018995514 +0100 -@@ -1,4 +1,4 @@ --46285 -+46286 - abaft - abbreviation/M - abdicate/DNGSn -@@ -22588,6 +22588,7 @@ - halter/d - halyard/MS - Hamal/M -+hames - Hamlin/M - hamper/dS - handbag/SMDG diff --git a/en_US-strippedabbrevs.patch b/en_US-strippedabbrevs.patch deleted file mode 100644 index 1bb60a1..0000000 --- a/en_US-strippedabbrevs.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- scowl/speller/en.dic.supp.orig 2008-11-28 10:10:01.000000000 +0000 -+++ scowl/speller/en.dic.supp 2008-11-28 10:10:10.000000000 +0000 -@@ -21,3 +21,5 @@ - 7th/pt - 8th/pt - 9th/pt -+e.g. -+i.e. diff --git a/hunspell-en-SI_and_IEC.patch b/hunspell-en-SI_and_IEC.patch deleted file mode 100644 index 60778da..0000000 --- a/hunspell-en-SI_and_IEC.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- 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 -+EB -+Eb -+Ei -+EiB -+Eib - EULA - EULAs - FAQ -@@ -16,39 +21,75 @@ - GIF - GPU - GUI -+Gb -+Gi -+GiB -+Gib - GnuPG - HDD - HDMI - HTML - HTTP -+IEC - IMHO - IMNSHO - IMO - IRC - ISO -+JEDEC -+KB -+Kb -+Ki -+KiB -+Kib - JPEG - MB - MP3 - MP3s - MPEG - Mb -+Mi -+MiB -+Mib - OTOH - PCMCIA - PDF - PGP -+PB -+Pb -+Pi -+PiB -+Pib - RFC - ROFL - RTFM - SQL -+TB -+Tb -+Ti -+TiB -+Tib - URL - USB - USB - WWW - WYSIWYG - XML -+YB -+Yb -+Yi -+YiB -+Yib - YMMV -+ZB -+Zb -+Zi -+ZiB -+Zib - cf - dpi -+kB -+kb - pp - resp - vs diff --git a/hunspell-en-allow-non-typographical.marks.patch b/hunspell-en-allow-non-typographical.marks.patch deleted file mode 100644 index 0f8e552..0000000 --- a/hunspell-en-allow-non-typographical.marks.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- en_GB.aff 2010-04-15 14:51:13.000000000 +0100 -+++ en_GB.aff 2010-04-15 14:52:07.000000000 +0100 -@@ -6,6 +6,7 @@ - # R 1.18, 11/04/05 - SET ISO8859-1 - TRY esiaénrtolcdugmfphbyvkw-'.zqjxSNRTLCGDMFPHBEAUYOIVKWóöâôZQJXÅçèîêàïüäñ -+WORDCHARS 0123456789' - REP 27 - REP f ph - REP ph f ---- scowl/speller/en.aff 2010-04-15 14:56:37.000000000 +0100 -+++ scowl/speller/en.aff 2010-04-15 14:57:08.000000000 +0100 -@@ -12,7 +12,7 @@ - COMPOUNDRULE 2 - COMPOUNDRULE n*1t - COMPOUNDRULE n*mp --WORDCHARS 0123456789 -+WORDCHARS 0123456789' - - PFX A Y 1 - PFX A 0 re . diff --git a/hunspell-en-calender.patch b/hunspell-en-calender.patch deleted file mode 100644 index 6f4fb89..0000000 --- a/hunspell-en-calender.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- wordlist/en_GB.dic 2011-02-08 11:43:16.730271377 +0000 -+++ wordlist/en_GB.dic 2011-02-08 11:43:35.261482189 +0000 -@@ -1,4 +1,4 @@ --46286 -+46285 - abaft - abbreviation/M - abdicate/DNGSn -@@ -643,7 +643,6 @@ - Calder - caldera/SM - caldron's --calender/dMS - 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-dont-call-git-during-build.patch b/hunspell-en-dont-call-git-during-build.patch deleted file mode 100644 index 42ea3be..0000000 --- a/hunspell-en-dont-call-git-during-build.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- wordlist/scowl/README.in 2014-10-08 14:00:05.682971887 +0100 -+++ wordlist/scowl/README.in 2014-10-08 14:00:12.369050485 +0100 -@@ -1,6 +1,4 @@ - Spell Checking Oriented Word Lists (SCOWL) --@`if [ "$SCOWL_VERSION" ]; then echo -n "Version $SCOWL_VERSION"; fi` --@`git log --pretty=format:'%cd [%h]' -n 1 --` - by Kevin Atkinson (kevina@gnu.org) - - The SCOWL is a collection of word lists split up in various sizes, and 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.spec b/hunspell-en.spec index 2a05b7c..07cf51e 100644 --- a/hunspell-en.spec +++ b/hunspell-en.spec @@ -1,63 +1,25 @@ -%global upstreamid 20140811.1 - Name: hunspell-en +Version: 0.201910.06 +Release: 1 Summary: English hunspell dictionaries -Version: 0.%{upstreamid} -Release: 15 -Source0: https://github.com/en-wl/wordlist/archive/rel-2014.08.11.1.tar.gz -Source1: https://download.services.openoffice.org/contrib/dictionaries/en_GB.zip -#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 -#http://sourceforge.net/tracker/?func=detail&aid=2355344&group_id=10079&atid=1014602 -Patch3: en_US-strippedabbrevs.patch -#https://sourceforge.net/tracker/?func=detail&aid=2987192&group_id=143754&atid=756397 -Patch4: hunspell-en-allow-non-typographical.marks.patch -#https://sourceforge.net/tracker/?func=detail&aid=3012183&group_id=10079&atid=1014602 -#https://bugzilla.redhat.com/show_bug.cgi?id=619577 add SI and IEC prefixes -Patch5: hunspell-en-SI_and_IEC.patch -#https://sourceforge.net/tracker/?func=detail&aid=3175662&group_id=10079&atid=1014602 obscure Calender hides misspelling of Calendar -Patch6: hunspell-en-calender.patch -Patch7: en_IE.supplemental.patch -Patch8: hunspell-en-dont-call-git-during-build.patch -Patch9: hunspell-en-fixbuild.patch -Patch10: en_GB.etc.patch -Patch11: perl.regex.patch -URL: https://wordlist.sourceforge.net/ License: LGPLv2+ and LGPLv2 and BSD +URL: https://wordlist.sourceforge.net/ +Source0: https://github.com/en-wl/wordlist/archive/rel-2019.10.06.tar.gz + BuildArch: noarch BuildRequires: git aspell zip dos2unix perl-Getopt-Long gcc-c++ Requires: hunspell -Supplements: (hunspell and langpacks-en) (hunspell and langpacks-en_GB) -Provides: %{name}-GB -Obsoletes: %{name}-GB - -Provides: %{name}-US -Obsoletes: %{name}-US +Provides: %{name}-US = %{version}-%{release} +Obsoletes: %{name}-US < %{version}-%{release} %description English (US, UK, etc.) hunspell dictionaries - %package_help %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 +%autosetup -n wordlist-rel-2019.10.06 -p1 %build export PERL5LIB=`pwd`/scowl/r/varcon${PERL5LIB:+:${PERL5LIB}} @@ -77,16 +39,10 @@ done %install mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell -cp -p en_??.dic en_??.aff $RPM_BUILD_ROOT/%{_datadir}/myspell cd scowl/speller cp -p en_??.dic en_??.aff $RPM_BUILD_ROOT/%{_datadir}/myspell 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" -for lang in $en_GB_aliases; do - ln -s en_GB.aff $lang.aff - ln -s en_GB.dic $lang.dic -done en_US_aliases="en_PH" for lang in $en_US_aliases; do ln -s en_US.aff $lang.aff @@ -94,18 +50,23 @@ for lang in $en_US_aliases; do done popd - %files %defattr(-,root,root) %doc scowl/speller/README_en_*.txt README.md -%license scowl/speller/aspell/Copyright.in +%license scowl/speller/aspell/Copyright.sh %{_datadir}/myspell/* %files help %defattr(-,root,root) -%doc README_en_GB.txt scowl/speller/aspell/doc/ChangeLog +%doc scowl/speller/aspell/doc/ChangeLog %changelog +* Wed Jan 8 2020 songnannan - 0.201910.06-1 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: update to 201910.06 + * Sat Oct 19 2019 openEuler Buildteam - 0.20140811.1-15 - Type:bugfix - Id:NA @@ -115,3 +76,4 @@ popd * Fri Sep 20 2019 openEuler Buildteam - 0.20140811.1-14 - Package init + diff --git a/mozilla_words.patch b/mozilla_words.patch deleted file mode 100644 index 5838f40..0000000 --- a/mozilla_words.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- 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 - Bugzilla -+Camino -+ChatZilla - Closure - Debian - Dropbox -@@ -19,23 +21,28 @@ - GNU - Gentoo - GitHub -+Haskell - Hunspell - ISO - Instagram - Ispell - LibreOffice - LyX -+Mandriva - Mozilla -+MySpell - NSA - Netflix - OpenOffice - PayPal - PowerPC - Roku -+SeaMonkey - SUSE - Scala - Slackware - Sourceforge -+Sunbird - 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 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/rel-2014.08.11.1.tar.gz b/rel-2019.10.06.tar.gz similarity index 62% rename from rel-2014.08.11.1.tar.gz rename to rel-2019.10.06.tar.gz index af43d3b..d219f8c 100644 Binary files a/rel-2014.08.11.1.tar.gz and b/rel-2019.10.06.tar.gz differ