4 changed files with 62 additions and 243 deletions
--- a/.enchant2.metadata
+++ b/.enchant2.metadata
@ -1 +1 @@
-9e3a33d260b4045b1c0161f50958c6ec88f45061 SOURCES/enchant-2.6.7.tar.gz
+70aabc4cceeaef69dd64b879772aea2d36b08bad SOURCES/enchant-2.2.15.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/enchant-2.6.7.tar.gz
+SOURCES/enchant-2.2.15.tar.gz
--- a/SOURCES/enchant_aspell.patch
+++ b/SOURCES/enchant_aspell.patch
@ -0,0 +1,29 @@
+diff -rupN --no-dereference enchant-2.2.15/configure.ac enchant-2.2.15-new/configure.ac
+--- enchant-2.2.15/configure.ac	2020-12-22 19:34:03.000000000 +0100
+++ enchant-2.2.15-new/configure.ac	2020-12-23 01:58:30.716732566 +0100
+@@ -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 -rupN --no-dereference enchant-2.2.15/providers/Makefile.am enchant-2.2.15-new/providers/Makefile.am
+--- enchant-2.2.15/providers/Makefile.am	2020-02-27 14:05:18.000000000 +0100
+++ enchant-2.2.15-new/providers/Makefile.am	2020-12-23 01:58:30.716732566 +0100
+@@ -12,6 +12,7 @@ AM_LDFLAGS = -module -avoid-version -no-
+ if WITH_ASPELL
+ provider_LTLIBRARIES += enchant_aspell.la
+ endif
+enchant_aspell_la_LIBADD = $(ASPELL_LIBS)
+ 
+ if WITH_HSPELL
+ provider_LTLIBRARIES += enchant_hspell.la
+diff -rupN --no-dereference enchant-2.2.15/tests/test.pwl.orig enchant-2.2.15-new/tests/test.pwl.orig
+--- enchant-2.2.15/tests/test.pwl.orig	2017-02-04 18:34:34.000000000 +0100
+++ enchant-2.2.15-new/tests/test.pwl.orig	1970-01-01 01:00:00.000000000 +0100
+@@ -1,2 +0,0 @@
+-hello
+-tag
--- a/SPECS/enchant2.spec
+++ b/SPECS/enchant2.spec
@ -1,52 +1,42 @@
-%bcond mingw %[%{undefined rhel} && %{undefined flatpak}]
-
 Name:          enchant2
-Version:       2.6.7
-Release:       2%{?dist}
+Version:       2.2.15
+Release:       6%{?snap}%{?dist}
 Summary:       An Enchanting Spell Checking Library

-License:       LGPL-2.0-or-later
+License:       LGPLv2+
 URL:           https://github.com/AbiWord/enchant
 Source0:       https://github.com/AbiWord/enchant/releases/download/v%{version}/enchant-%{version}.tar.gz

+# Look for aspell using pkg-config, instead of AC_CHECK_LIB which adds -laspell
+# to the global LIBS and over-links libenchant (#1574893)
+Patch0:        enchant_aspell.patch
+
 BuildRequires: automake autoconf libtool

 BuildRequires: gcc-c++
-BuildRequires: make
 BuildRequires: glib2-devel
+BuildRequires: aspell-devel
 BuildRequires: hunspell-devel
 BuildRequires: libvoikko-devel
 %if !0%{?rhel}
-BuildRequires: nuspell-devel
-%endif
-
-%if %{with mingw}
-BuildRequires: mingw32-filesystem >= 131
-BuildRequires: mingw32-gcc-c++
-BuildRequires: mingw32-glib2
-BuildRequires: mingw32-hunspell
-%if !0%{?rhel}
-BuildRequires: mingw32-nuspell
-%endif
-
-
-BuildRequires: mingw64-filesystem >= 131
-BuildRequires: mingw64-gcc-c++
-BuildRequires: mingw64-glib2
-BuildRequires: mingw64-hunspell
-%if !0%{?rhel}
-BuildRequires: mingw64-nuspell
-%endif
+BuildRequires: nuspell-devel >= 4.1.0
 %endif
+BuildRequires: make

 Provides:      bundled(gnulib)
-Obsoletes:     enchant2-aspell < 2.5.0-2


 %description
 A library that wraps other spell checking backends.


+%package aspell
+Summary:       Integration with aspell for libenchant
+Requires:      enchant2%{?_isa} = %{version}-%{release}
+
+%description aspell
+Libraries necessary to integrate applications using libenchant with aspell.
+
 %if !0%{?rhel}
 %package nuspell
 Summary:       Integration with Nuspell for libenchant
@ -76,27 +66,6 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.


-%if %{with mingw}
-%package -n mingw32-%{name}
-Summary:       MinGW Windows %{name} library
-BuildArch:     noarch
-
-%description -n mingw32-%{name}
-MinGW Windows %{pkgname} library.
-
-
-%package -n mingw64-%{name}
-Summary:       MinGW Windows %{name} library
-BuildArch:     noarch
-
-%description -n mingw64-%{name}
-MinGW Windows %{name} library.
-%endif
-
-
-%{?mingw_debug_package}
-
-
 %prep
 %autosetup -p1 -n enchant-%{version}

@ -105,52 +74,25 @@ autoreconf -ifv


 %build
-# Native build
-mkdir build_native
-pushd build_native
-%define _configure ../configure
 %configure \
-    --with-hunspell-dir=%{_datadir}/hunspell \
+    --with-aspell \
+    --with-hunspell-dir=%{_datadir}/myspell \
 %if !0%{?rhel}
    --with-nuspell \
 %endif
    --without-hspell \
-    --disable-static \
-    --docdir=%{_defaultdocdir}/%{name}
+    --disable-static
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g;
        s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %make_build pkgdatadir=%{_datadir}/enchant-2
-popd
-
-%if %{with mingw}
-# MinGW build
-MINGW32_CONFIGURE_ARGS="--with-hunspell-dir=%{mingw32_datadir}/hunspell" \
-MINGW64_CONFIGURE_ARGS="--with-hunspell-dir=%{mingw64_datadir}/hunspell" \
-%mingw_configure --disable-static --without-hspell --enable-relocatable
-
-MINGW32_MAKE_ARGS="pkgdatadir=%{mingw32_datadir}/enchant-2" \
-MINGW64_MAKE_ARGS="pkgdatadir=%{mingw64_datadir}/enchant-2" \
-%mingw_make_build
-%endif


 %install
-# Native build
-%make_install -C build_native pkgdatadir=%{_datadir}/enchant-2
-
-%if %{with mingw}
-# MinGW build
-MINGW32_MAKE_ARGS="pkgdatadir=%{mingw32_datadir}/enchant-2" \
-MINGW64_MAKE_ARGS="pkgdatadir=%{mingw64_datadir}/enchant-2" \
-%mingw_make_install
-rm -rf %{buildroot}%{mingw32_datadir}/{doc,man}
-rm -rf %{buildroot}%{mingw64_datadir}/{doc,man}
-%endif
-
+%make_install pkgdatadir=%{_datadir}/enchant-2
 find %{buildroot} -name '*.la' -delete


-%{?mingw_debug_install_post}
+%ldconfig_scriptlets


 %files
@ -162,7 +104,10 @@ find %{buildroot} -name '*.la' -delete
 %dir %{_libdir}/enchant-2
 %{_libdir}/enchant-2/enchant_hunspell.so
 %{_mandir}/man1/*
-%{_datadir}/enchant-2-2
+%{_datadir}/enchant-2
+
+%files aspell
+%{_libdir}/enchant-2/enchant_aspell.so*

 %if !0%{?rhel}
 %files nuspell
@ -173,173 +118,18 @@ find %{buildroot} -name '*.la' -delete
 %{_libdir}/enchant-2/enchant_voikko.so*

 %files devel
-%doc %{_defaultdocdir}/%{name}/enchant.html
-%doc %{_defaultdocdir}/%{name}/enchant-2.html
-%doc %{_defaultdocdir}/%{name}/enchant-lsmod-2.html
 %{_libdir}/libenchant-2.so
 %{_libdir}/pkgconfig/enchant-2.pc
 %{_includedir}/enchant-2
-%{_mandir}/man5/enchant.5*
-
-
-%if %{with mingw}
-%files -n mingw32-%{name}
-%license COPYING.LIB
-%{mingw32_bindir}/enchant-lsmod-2.exe
-%{mingw32_bindir}/enchant-2.exe
-%{mingw32_bindir}/libenchant-2.dll
-%{mingw32_includedir}/enchant-2/
-%dir %{mingw32_libdir}/enchant-2/
-%{mingw32_libdir}/enchant-2/enchant_hunspell.dll
-%{mingw32_libdir}/enchant-2/enchant_hunspell.dll.a
-%if !0%{?rhel}
-%{mingw32_libdir}/enchant-2/enchant_nuspell.dll
-%{mingw32_libdir}/enchant-2/enchant_nuspell.dll.a
-%endif
-%{mingw32_libdir}/libenchant-2.dll.a
-%{mingw32_libdir}/pkgconfig/enchant-2.pc
-%{mingw32_datadir}/enchant-2-2/
-
-%files -n mingw64-%{name}
-%license COPYING.LIB
-%{mingw64_bindir}/enchant-lsmod-2.exe
-%{mingw64_bindir}/enchant-2.exe
-%{mingw64_bindir}/libenchant-2.dll
-%{mingw64_includedir}/enchant-2/
-%dir %{mingw64_libdir}/enchant-2/
-%{mingw64_libdir}/enchant-2/enchant_hunspell.dll
-%{mingw64_libdir}/enchant-2/enchant_hunspell.dll.a
-%if !0%{?rhel}
-%{mingw64_libdir}/enchant-2/enchant_nuspell.dll
-%{mingw64_libdir}/enchant-2/enchant_nuspell.dll.a
-%endif
-%{mingw64_libdir}/libenchant-2.dll.a
-%{mingw64_libdir}/pkgconfig/enchant-2.pc
-%{mingw64_datadir}/enchant-2-2/
-%endif


 %changelog
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.6.7-2
- Bump release for June 2024 mass rebuild
-
-* Mon Feb 12 2024 Sandro Mani <manisandro@gmail.com> - 2.6.7-1
- Update to 2.6.7
-
-* Mon Feb 05 2024 Sandro Mani <manisandro@gmail.com> - 2.6.6-2
- Rebuild (icu)
-
-* Mon Feb 05 2024 Sandro Mani <manisandro@gmail.com> - 2.6.6-1
- Update to 2.6.6
-
-* Wed Jan 31 2024 Pete Walter <pwalter@fedoraproject.org> - 2.6.5-4
- Rebuild for ICU 74
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Jan 09 2024 Sandro Mani <manisandro@gmail.com> - 2.6.5-1
- Update to 2.6.5
-
-* Tue Dec 12 2023 Sandro Mani <manisandro@gmail.com> - 2.6.4-1
- Update to 2.6.4
-
-* Sun Dec 03 2023 Sandro Mani <manisandro@gmail.com> - 2.6.3-1
- Update to 2.6.3
-
-* Wed Nov 01 2023 Sandro Mani <manisandro@gmail.com> - 2.6.2-1
- Update to 2.6.2
-
-* Mon Sep 25 2023 Sandro Mani <manisandro@gmail.com> - 2.6.1-1
- Update to 2.6.1
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jul 18 2023 Sandro Mani <manisandro@gmail.com> - 2.5.0-4
- Rebuild (mingw-icu)
-
-* Tue Jul 11 2023 František Zatloukal <fzatlouk@redhat.com> - 2.5.0-3
- Rebuilt for ICU 73.2
-
-* Tue Jul 04 2023 Sandro Mani <manisandro@gmail.com> - 2.5.0-2
- Drop aspell subpackage (#2218153)
-
-* Wed May 24 2023 Sandro Mani <manisandro@gmail.com> - 2.5.0-1
- Update to 2.5.0
-
-* Tue May 23 2023 Sandro Mani <manisandro@gmail.com> - 2.4.0-1
- Update to 2.4.0
-
-* Mon Apr 24 2023 Sandro Mani <manisandro@gmail.com> - 2.3.4-2
- Disable mingw by default in RHEL builds
-
-* Mon Feb 20 2023 Sandro Mani <manisandro@gmail.com> - 2.3.4-1
- Update to 2.3.4
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jan 04 2023 Sandro Mani <manisandro@gmail.com> - 2.3.3-5
- Rebuild (mingw-icu)
-
-* Tue Jan 03 2023 Sandro Mani <manisandro@gmail.com> - 2.3.3-4
- Rebuild (mingw-icu)
-
-* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 2.3.3-3
- Rebuild for ICU 72
-
-* Sat Aug 06 2022 Sandro Mani <manisandro@gmail.com> - 2.3.3-2
- Rebuild (mingw-icu)
-
-* Mon Aug 01 2022 Sandro Mani <manisandro@gmail.com> - 2.3.3-1
- Update to 2.3.3
-
-* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 2.3.2-8
- Rebuilt for ICU 71.1
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Mar 25 2022 Sandro Mani <manisandro@gmail.com> - 2.3.2-6
- Rebuild with mingw-gcc-12
-
-* Thu Feb 24 2022 Sandro Mani <manisandro@gmail.com> - 2.3.2-5
- Make mingw subpackages noarch
-
-* Thu Feb 24 2022 Sandro Mani <manisandro@gmail.com> - 2.3.2-4
- Add mingw subpackages
-
-* Tue Jan 25 2022 Parag Nemade <pnemade AT redhat DOT com> - 2.3.2-3
- Update hunspell-dir path
-  F36 Change https://fedoraproject.org/wiki/Changes/Hunspell_dictionary_dir_change
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sun Dec 05 2021 Sandro Mani <manisandro@gmail.com> - 2.3.2-1
- Update to 2.3.2
-
-* Wed Aug 11 2021 Sandro Mani <manisandro@gmail.com> - 2.3.1-1
- Update to 2.3.1
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 15 2021 Sandro Mani <manisandro@gmail.com> - 2.3.0-1
- Update to 2.3.0
-
-* Wed May 19 2021 Pete Walter <pwalter@fedoraproject.org> - 2.2.15-7
- Rebuild for ICU 69
-
-* Wed May 19 2021 Pete Walter <pwalter@fedoraproject.org> - 2.2.15-6
- Rebuild for ICU 69
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.2.15-6
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Sat Mar 06 2021 Peter Oliver <rpm@mavit.org.uk> - 2.2.15-5
- Recommend enchant2-aspell if enchant2 and aspell are both installed.
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.2.15-5
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

 * Mon Feb 08 2021 Kalev Lember <klember@redhat.com> - 2.2.15-4
 - Disable nuspell support for RHEL (#1925839)