Compare commits

...

No commits in common. "c8" and "c9" have entirely different histories.
c8 ... c9

4 changed files with 141 additions and 10 deletions

View File

@ -1 +1 @@
181d5563d282af0f30c7ab68c5d432271b6fd11e SOURCES/enchant-2.2.3.tar.gz
70aabc4cceeaef69dd64b879772aea2d36b08bad SOURCES/enchant-2.2.15.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/enchant-2.2.3.tar.gz
SOURCES/enchant-2.2.15.tar.gz

View File

@ -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

View File

@ -1,16 +1,27 @@
Name: enchant2
Version: 2.2.3
Release: 3%{?snap}%{?dist}
Version: 2.2.15
Release: 6%{?snap}%{?dist}
Summary: An Enchanting 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
# 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: glib2-devel
BuildRequires: aspell-devel
BuildRequires: hunspell-devel
BuildRequires: libvoikko-devel
%if !0%{?rhel}
BuildRequires: nuspell-devel >= 4.1.0
%endif
BuildRequires: make
Provides: bundled(gnulib)
@ -26,9 +37,20 @@ 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
Requires: enchant2%{?_isa} = %{version}-%{release}
Supplements: (enchant2 and nuspell)
%description nuspell
Libraries necessary to integrate applications using libenchant with Nuspell.
%endif
%package voikko
Summary: Integration with voikko for libenchant
Requires: enchant2%{?_isa} = %{version}-%{release}
Supplements: (enchant2 and langpacks-fi)
%description voikko
Libraries necessary to integrate applications using libenchant with voikko.
@ -47,11 +69,18 @@ developing applications that use %{name}.
%prep
%autosetup -p1 -n enchant-%{version}
# Needed for Patch0
autoreconf -ifv
%build
%configure \
--with-aspell \
--with-hunspell-dir=%{_datadir}/myspell \
%if !0%{?rhel}
--with-nuspell \
%endif
--without-hspell \
--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
@ -63,9 +92,7 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g;
find %{buildroot} -name '*.la' -delete
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%ldconfig_scriptlets
%files
@ -82,6 +109,11 @@ find %{buildroot} -name '*.la' -delete
%files aspell
%{_libdir}/enchant-2/enchant_aspell.so*
%if !0%{?rhel}
%files nuspell
%{_libdir}/enchant-2/enchant_nuspell.so*
%endif
%files voikko
%{_libdir}/enchant-2/enchant_voikko.so*
@ -92,9 +124,79 @@ find %{buildroot} -name '*.la' -delete
%changelog
* Tue Oct 13 2020 Tomas Popela <tpopela@redhat.com> - 2.2.3-3
- Rebuild for the annobin fixes
- Resolves: rhbz#1703990
* 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
* 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)
* Tue Feb 2 2021 Peter Oliver <rpm@mavit.org.uk> - 2.2.15-3
- Include support for Nuspell.
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Dec 23 2020 Sandro Mani <manisandro@gmail.com> - 2.2.15-1
- Update to 2.2.15
* Mon Dec 14 2020 Sandro Mani <manisandro@gmail.com> - 2.2.14-1
- Update to 2.2.14
* Tue Nov 03 2020 Sandro Mani <manisandro@gmail.com> - 2.2.13-1
- Update to 2.2.13
* Sat Oct 17 2020 Sandro Mani <manisandro@gmail.com> - 2.2.12-1
- Update to 2.2.12
* Tue Sep 08 2020 Sandro Mani <manisandro@gmail.com> - 2.2.11-1
- Update to 2.2.11
* Wed Sep 02 2020 Sandro Mani <manisandro@gmail.com> - 2.2.10-1
- Update to 2.2.10
* Mon Aug 24 2020 Sandro Mani <manisandro@gmail.com> - 2.2.9-1
- Update to 2.2.9
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Mar 02 2020 Sandro Mani <manisandro@gmail.com> - 2.2.8-1
- Update to 2.2.8
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Sep 15 2019 Sandro Mani <manisandro@gmail.com> - 2.2.7-1
- Update to 2.2.7
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Jul 01 2019 Sandro Mani <manisandro@gmail.com> - 2.2.5-1
- Update to 2.2.5
* Fri Jun 28 2019 Sandro Mani <manisandro@gmail.com> - 2.2.4-2
- Add patch to fix memory leaks (#1718084)
- Pass --without-hspell
* Tue Jun 18 2019 Sandro Mani <manisandro@gmail.com> - 2.2.4-1
- Update to 2.2.4
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Jun 15 2018 Sandro Mani <manisandro@gmail.com> - 2.2.3-4
- Add patch to avoid unnecessary linking of libenchant against libaspell (#1574893)
* Wed May 16 2018 Parag Nemade <pnemade AT redhat DOT com> - 2.2.3-3
- Make enchant2-voikko installed by langpacks-fi package (#1578352)
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild