!6 split aspell and voikko subpackage & backport patch that enchant2 use hunspell

From: @dowzyx
Reviewed-by: @orange-snn
Signed-off-by: @orange-snn

backport-enchant_aspell.patch

@@ -0,0 +1,44 @@
+Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1574893
+Conflict: NA
+
+---
+ configure.ac          | 2 +-
+ providers/Makefile.am | 1 +
+ tests/test.pwl.orig   | 2 --
+ 3 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4877edc..eda506e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -210,7 +210,7 @@ build_providers=
+ dnl Standard providers
+ ENCHANT_CHECK_PKG_CONFIG_PROVIDER([hunspell], [HUNSPELL])
+ ENCHANT_CHECK_PKG_CONFIG_PROVIDER([nuspell], [NUSPELL], [nuspell >= 4.1.0])
+-ENCHANT_CHECK_LIB_PROVIDER([aspell], [ASPELL], [get_aspell_dict_info_list])
++ENCHANT_CHECK_PKG_CONFIG_PROVIDER([aspell], [ASPELL])
+ ENCHANT_CHECK_LIB_PROVIDER([hspell], [HSPELL], [hspell_get_dictionary_path],, [-lz])
+ ENCHANT_CHECK_PKG_CONFIG_PROVIDER([voikko], [VOIKKO], [libvoikko])
+ dnl FIXME: The test below assumes GCC(-compatible) ObjC++ compiler, but
+diff --git a/providers/Makefile.am b/providers/Makefile.am
+index 8571dcc..4ba8a94 100644
+--- a/providers/Makefile.am
++++ b/providers/Makefile.am
+@@ -12,6 +12,7 @@ AM_LDFLAGS = -module -avoid-version -no-undefined $(ENCHANT_LIBS) $(top_builddir
+ if WITH_ASPELL
+ provider_LTLIBRARIES += enchant_aspell.la
+ endif
++enchant_aspell_la_LIBADD = $(ASPELL_LIBS)
+ 
+ if WITH_HSPELL
+ provider_LTLIBRARIES += enchant_hspell.la
+diff --git a/tests/test.pwl.orig b/tests/test.pwl.orig
+index c6089a7..e69de29 100644
+--- a/tests/test.pwl.orig
++++ b/tests/test.pwl.orig
+@@ -1,2 +0,0 @@
+-hello
+-tag
+-- 
+2.23.0
+

enchant2.spec

@@ -1,15 +1,15 @@
 Name:           enchant2
 Version:        2.2.15
-Release:        1
+Release:        2
 Summary:        Generic spell checking library
 License:        LGPLv2+
 URL:            https://github.com/AbiWord/enchant
 Source0:        https://github.com/AbiWord/enchant/releases/download/v%{version}/enchant-%{version}.tar.gz
+Patch6000:      backport-enchant_aspell.patch
 
 BuildRequires:  automake autoconf libtool gcc-c++ glib2-devel aspell-devel hunspell-devel libvoikko-devel
 
-Provides:       bundled(gnulib) %{name}-aspell = %{version}-%{release} %{name}-voikko = %{version}-%{release}
-Obsoletes:      %{name}-aspell < %{version}-%{release} %{name}-voikko < %{version}-%{release}
+Provides:       bundled(gnulib)
 
 %description
 Enchant aims to provide a simple but comprehensive abstraction for dealing
@@ -26,6 +26,24 @@ Requires:       %{name} = %{version}-%{release} glib2-devel
 This package contains some libraries and header files for
 development of %{name}.
 
+%package        aspell
+Summary:        Aspell is integrated for libenchant
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-aspell = %{version}-%{release}
+Obsoletes:      %{name}-aspell < %{version}-%{release}
+
+%description    aspell
+Applications need libraries integrated by using libenchant with aspell.
+
+%package        voikko
+Summary:        voikko is integrated for libenchant
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-voikko = %{version}-%{release}
+Obsoletes:      %{name}-voikko < %{version}-%{release}
+
+%description    voikko
+Applications need libraries integrated by using libenchant with voikko.
+
 %package help
 Summary:        Help package for %{name}
 Requires:       %{name} = %{version}-%{release}
@@ -58,9 +76,15 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g;
 %license COPYING.LIB
 %{_bindir}/{enchant-2,enchant-lsmod-2}
 %{_libdir}/libenchant-2.so.*
-%{_libdir}/enchant-2/*
+%{_libdir}/enchant-2/enchant_hunspell.so
 %{_datadir}/enchant-2
 
+%files aspell
+%{_libdir}/enchant-2/enchant_aspell.so*
+
+%files voikko
+%{_libdir}/enchant-2/enchant_voikko.so*
+
 %files devel
 %{_libdir}/libenchant-2.so
 %{_libdir}/pkgconfig/enchant-2.pc
@@ -70,6 +94,12 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g;
 %{_mandir}/man1/*
 
 %changelog
+* Thu Apr 29 2021 zhaoyuxing <zhaoyuxing2@huawei.com> - 2.2.15-2
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC: split aspell and voikko subpackage & backport patch that enchant2 use hunspell
+
 * Mon Feb 1 2021 chengguipeng1 <chengguipeng1@huawei.com> - 2.2.15-1
 - DESC: update to 2.2.15