!18 [sync] PR-16: delete Indochina words

From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia

hunspell-en-delete-taboo-words.patch

@@ -0,0 +1,71 @@
+From 6d9194e68a9e7ef6148cfc939280a19fe725065c Mon Sep 17 00:00:00 2001
+From: jinzhimin <jinzhimin2@huawei.com>
+Date: Tue, 8 Dec 2020 11:04:40 +0800
+Subject: [PATCH] delete taboo words
+
+---
+ agid/infl.txt                         | 1 -
+ alt12dicts/2of12full.txt              | 1 -
+ alt12dicts/5desk.txt                  | 2 --
+ scowl/r/special/names.from_alan_beale | 1 -
+ 4 files changed, 5 deletions(-)
+
+diff --git a/agid/infl.txt b/agid/infl.txt
+index 531c9d0..226eb4a 100644
+--- a/agid/infl.txt
++++ b/agid/infl.txt
+@@ -5702,7 +5702,6 @@ Indianness N?: Indiannesses
+ Indic N: Indics
+ Indicatoridae N: Indicatoridaes?
+ Indigofera N: Indigoferas?, Indigoferae~? 1
+-Indochina N: Indochinas?, Indochinae~? 1
+ Indocin N: Indocins?
+ Indologist N?: Indologists
+ Indology N?: Indologies
+diff --git a/alt12dicts/2of12full.txt b/alt12dicts/2of12full.txt
+index 20c16da..6660ed8 100644
+--- a/alt12dicts/2of12full.txt
++++ b/alt12dicts/2of12full.txt
+@@ -23703,7 +23703,6 @@
+  5:  5  -#  -&  1=   indivisibility
+ 12: 12  -#  -&  3=   indivisible
+  7:  7  -#  -&  7=   indivisibly
+- 5:  5  -#  -&  -=   Indochina
+  2:  2  -#  -&  -=   Indochinese
+ 12: 12  -#  -&  -=   indoctrinate
+ 11: 11  -#  -&  -=   indoctrination
+diff --git a/alt12dicts/5desk.txt b/alt12dicts/5desk.txt
+index 7b23964..67e8352 100644
+--- a/alt12dicts/5desk.txt
++++ b/alt12dicts/5desk.txt
+@@ -26853,7 +26853,6 @@ individuation
+ indivisibility
+ indivisible
+ indivisibly
+-Indochina
+ Indochinese
+ indoctrinate
+ indoctrination
+@@ -29603,7 +29602,6 @@ Kosciuszko
+ kosher
+ Kosice
+ Kosovar
+-Kosovo
+ Kossuth
+ Kosygin
+ Kotah
+diff --git a/scowl/r/special/names.from_alan_beale b/scowl/r/special/names.from_alan_beale
+index 844f9ba..3c6e695 100644
+--- a/scowl/r/special/names.from_alan_beale
++++ b/scowl/r/special/names.from_alan_beale
+@@ -3479,7 +3479,6 @@ Indiana
+ Indianapolis
+ Indies
+ Indira
+-Indochina
+ Indochinese
+ Indo-European
+ Indonesia
+-- 
+2.23.0
+

hunspell-en-fixbuild-err.patch

@@ -1,24 +0,0 @@
-From 7c24bdae102853ca3deebe2ac47daf4fba4003b4 Mon Sep 17 00:00:00 2001
-From: traffic_millions <xiaoweiwei5@huawei.com>
-Date: Tue, 25 Feb 2020 20:54:33 +0800
-Subject: [PATCH] hunspell-en: fix build err
-
-Signed-off-by: traffic_millions <buildteam@openeuler.org>
----
- scowl/src/deaccent.hh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scowl/src/deaccent.hh b/scowl/src/deaccent.hh
-index c670005..1419706 100644
---- a/scowl/src/deaccent.hh
-+++ b/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, 
--- 
-1.8.3.1
-

hunspell-en.spec

@@ -1,12 +1,12 @@
 Name:          hunspell-en
-Version:       0.201910.06
+Version:       2020.12.07
 Release:       2
 Summary:       English hunspell dictionaries
 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
+URL:           http://wordlist.aspell.net
+Source0:       https://github.com/en-wl/wordlist/archive/rel-%{version}.tar.gz
 
-Patch0001:     hunspell-en-fixbuild-err.patch
+Patch9000:     hunspell-en-delete-taboo-words.patch
 
 BuildArch:     noarch
 BuildRequires: git aspell zip dos2unix perl-Getopt-Long gcc-c++
@@ -21,7 +21,7 @@ English (US, UK, etc.) hunspell dictionaries
 %package_help
 
 %prep
-%autosetup -n wordlist-rel-2019.10.06 -p1
+%autosetup -n wordlist-rel-2020.12.07 -p1
 
 %build
 export PERL5LIB=`pwd`/scowl/r/varcon${PERL5LIB:+:${PERL5LIB}}
@@ -63,6 +63,24 @@ popd
 %doc scowl/speller/aspell/doc/ChangeLog 
 
 %changelog
+* Mon Jan 17 2022 liuyumeng <liuyumeng5@huawei.com> - 2020.12.07-2
+- round self-developed patch
+
+* Thu Jan 28 2021 zhanzhimin <zhanzhimin@huawei.com> - 2020.12.07-1
+- update to 2020.12.07
+
+* Thu Dec 17 2020 hanhui <hanhui15@huawei.com> - 2019.10.06-5
+- modify url
+
+* Wed Dec 16 2020 hanhui <hanhui15@huawei.com> - 2019.10.06-4
+- modify url
+
+* Thu Aug 20 2020 jinzhimin<jinzhimin2@huawei.com> - 2019.10.06-3
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: fix the version as 2019.10.06
+
 * Tue Feb 25 2020 xiaoweiwei<xiaoweiwei5@huawei.com> - 0.201910.06-2
 - Type:bugfix
 - ID:NA