From 73ecf2a5767a9eaa4016835a04d94b45d597b278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 13 Nov 2018 11:59:45 +0000 Subject: [PATCH 01/44] latest release --- hunspell.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hunspell.spec b/hunspell.spec index f12997d..dfb1b7f 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -2,8 +2,8 @@ Name: hunspell Summary: A spell checker and morphological analyzer library -Version: 1.6.2 -Release: 3%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz Group: System Environment/Libraries URL: https://github.com/hunspell/hunspell @@ -90,7 +90,7 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %postun -p /sbin/ldconfig %files -f %{name}.lang -%doc README README.myspell COPYING COPYING.LESSER COPYING.MPL AUTHORS AUTHORS.myspell license.hunspell license.myspell THANKS +%doc README COPYING COPYING.LESSER COPYING.MPL AUTHORS license.hunspell license.myspell THANKS %{_libdir}/*.so.* %{_datadir}/myspell %{_bindir}/hunspell @@ -118,6 +118,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_mandir}/man5/hunspell.5.gz %changelog +* Tue Nov 13 2018 Caolán McNamara - 1.7.0-1 +- latest release + * Fri Jul 13 2018 Fedora Release Engineering - 1.6.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 3ad3f366eb40ff7253afbb89341204b123877aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 13 Nov 2018 12:05:46 +0000 Subject: [PATCH 02/44] latest release --- .gitignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0ca46b9..eb11a9d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/v1.6.2.tar.gz +/v1.7.0.tar.gz diff --git a/sources b/sources index 3b7eb92..07935b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.6.2.tar.gz) = a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11 +SHA512 (v1.7.0.tar.gz) = 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 From cc3ba500f12964a16358b2a0614c185bc73e76ec Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:39:17 +0100 Subject: [PATCH 03/44] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- hunspell.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hunspell.spec b/hunspell.spec index dfb1b7f..fa2ff4f 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -85,9 +85,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %find_lang %{name} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -f %{name}.lang %doc README COPYING COPYING.LESSER COPYING.MPL AUTHORS license.hunspell license.myspell THANKS From 5ed3140b190ce838c6a2669d46e2a8b4d8cb82ed Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:48 +0100 Subject: [PATCH 04/44] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- hunspell.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/hunspell.spec b/hunspell.spec index fa2ff4f..f251a69 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -5,7 +5,6 @@ Summary: A spell checker and morphological analyzer library Version: 1.7.0 Release: 1%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz -Group: System Environment/Libraries URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 BuildRequires: gcc-c++ @@ -28,7 +27,6 @@ Curses library, Ispell pipe interface, LibreOffice UNO module. %package devel Requires: hunspell = %{version}-%{release}, pkgconfig Summary: Files for developing with hunspell -Group: Development/Libraries %description devel Includes and definitions for developing with hunspell From 44e4fe5f7853faf5c2184e382147c9c902945d5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 02:31:12 +0000 Subject: [PATCH 05/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index f251a69..76cbd69 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -114,6 +114,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_mandir}/man5/hunspell.5.gz %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Nov 13 2018 Caolán McNamara - 1.7.0-1 - latest release From b72077dc0fb06f88c2b3839a534bb0aab4e25d54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 08:41:08 +0000 Subject: [PATCH 06/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index 76cbd69..c4ce61c 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -114,6 +114,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_mandir}/man5/hunspell.5.gz %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 1.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 01fa8fbcad80edfa103a2981e7aec50d29e9cc73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 12 Nov 2019 20:16:29 +0000 Subject: [PATCH 07/44] Resolves: rhbz#1771027 CVE-2019-16707 --- 0001-invalid-read-memory-access-624.patch | 25 +++++++++++++++++++++++ hunspell.spec | 8 +++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-invalid-read-memory-access-624.patch diff --git a/0001-invalid-read-memory-access-624.patch b/0001-invalid-read-memory-access-624.patch new file mode 100644 index 0000000..66b55e7 --- /dev/null +++ b/0001-invalid-read-memory-access-624.patch @@ -0,0 +1,25 @@ +From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 12 Nov 2019 20:03:15 +0000 +Subject: [PATCH] invalid read memory access #624 + +--- + src/hunspell/suggestmgr.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx +index dba084e..c23f165 100644 +--- a/src/hunspell/suggestmgr.cxx ++++ b/src/hunspell/suggestmgr.cxx +@@ -2040,7 +2040,7 @@ int SuggestMgr::leftcommonsubstring( + int l2 = su2.size(); + // decapitalize dictionary word + if (complexprefixes) { +- if (su1[l1 - 1] == su2[l2 - 1]) ++ if (l1 && l2 && su1[l1 - 1] == su2[l2 - 1]) + return 1; + } else { + unsigned short idx = su2.empty() ? 0 : (su2[0].h << 8) + su2[0].l; +-- +2.23.0 + diff --git a/hunspell.spec b/hunspell.spec index c4ce61c..57f95fc 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 3%{?dist} +Release: 4%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -18,6 +18,8 @@ BuildRequires: words %endif Requires: hunspell-en-US +Patch0: 0001-invalid-read-memory-access-624.patch + %description Hunspell is a spell checker and morphological analyzer library and program designed for languages with rich morphology and complex word compounding or @@ -33,6 +35,7 @@ Includes and definitions for developing with hunspell %prep %setup -q +%patch0 -p1 -b .CVE-2019-16707 %build autoreconf -vfi @@ -114,6 +117,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_mandir}/man5/hunspell.5.gz %changelog +* Tue Nov 12 2019 Caolán McNamara - 1.7.0-4 +- Resolves: rhbz#1771027 CVE-2019-16707 + * Thu Jul 25 2019 Fedora Release Engineering - 1.7.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 593ae09a892f34080df6ae98d917e6efe4ce199b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 04:31:04 +0000 Subject: [PATCH 08/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index 57f95fc..cf5ed6e 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 4%{?dist} +Release: 5%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -117,6 +117,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_mandir}/man5/hunspell.5.gz %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.7.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 12 2019 Caolán McNamara - 1.7.0-4 - Resolves: rhbz#1771027 CVE-2019-16707 From 113b75deb7918fda40fd5fb1db7a7743c4cb7bd8 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jul 2020 16:08:49 +0000 Subject: [PATCH 09/44] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- hunspell.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hunspell.spec b/hunspell.spec index cf5ed6e..8b73153 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 5%{?dist} +Release: 6%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -50,7 +50,7 @@ configureflags="--disable-rpath --disable-static --with-ui --with-readline" %if !%{double_profiling_build} %configure $configureflags -make %{?_smp_mflags} +%make_build %else #Generate a word list to use for profiling, take half of it to ensure #that the original word list is then considered to contain correctly @@ -60,7 +60,7 @@ head -n $((`cat /usr/share/dict/words | wc -l`/2)) /usr/share/dict/words |\ #generate profiling %{profilegenerate} %configure $configureflags -make %{?_smp_mflags} +%make_build ./src/tools/affixcompress words > /dev/null 2>&1 ./src/tools/hunspell -d words -l /usr/share/dict/words > /dev/null make check @@ -68,9 +68,9 @@ make distclean #use profiling %{profileuse} %configure $configureflags -make %{?_smp_mflags} +%make_build %endif -cd po && make %{?_smp_mflags} update-gmo && cd .. +cd po && %make_build update-gmo && cd .. %check %ifarch %{ix86} x86_64 @@ -80,7 +80,7 @@ make check %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%make_install rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell @@ -117,6 +117,10 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_mandir}/man5/hunspell.5.gz %changelog +* Tue Jul 14 2020 Tom Stellard - 1.7.0-6 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Wed Jan 29 2020 Fedora Release Engineering - 1.7.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 68215164a007287f3d979cc8893a39df0a98b449 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 01:03:49 +0000 Subject: [PATCH 10/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index 8b73153..beb21cc 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 6%{?dist} +Release: 7%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -117,6 +117,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_mandir}/man5/hunspell.5.gz %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.7.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 14 2020 Tom Stellard - 1.7.0-6 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From 31b3c6087f7eb6ddc2fafbbfb64292f51679dbd7 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 05:38:30 +0000 Subject: [PATCH 11/44] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- hunspell.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/hunspell.spec b/hunspell.spec index beb21cc..d020dd2 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -16,6 +16,7 @@ BuildRequires: valgrind %if %{double_profiling_build} BuildRequires: words %endif +BuildRequires: make Requires: hunspell-en-US Patch0: 0001-invalid-read-memory-access-624.patch From 2924da3ae4947acdb8658eaa73b610df51ea125c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 13:39:02 +0000 Subject: [PATCH 12/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index d020dd2..fe64b86 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 7%{?dist} +Release: 8%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -118,6 +118,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_mandir}/man5/hunspell.5.gz %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.7.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.7.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 3e59a6e239b92aa3f512e8ce5acbff4092cf89b9 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Wed, 3 Feb 2021 13:17:43 +0000 Subject: [PATCH 13/44] Accomodate Nuspell by putting the dictionary dir in its own subpackage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Given that itʼs compatible with Hunspell dictionaries, package `nuspell` requires `hunspell-en-US`, which in turn requires `hunspell`. It doesnʼt seem right that installing one spellchecking backend should cause a different one to be pulled in, so this commit seeks to break that chain by giving the `/usr/share/myspell` directory a package of its own. --- hunspell.spec | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/hunspell.spec b/hunspell.spec index fe64b86..c679b9a 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 8%{?dist} +Release: 9%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -18,6 +18,7 @@ BuildRequires: words %endif BuildRequires: make Requires: hunspell-en-US +Requires: hunspell-filesystem Patch0: 0001-invalid-read-memory-access-624.patch @@ -34,6 +35,13 @@ Summary: Files for developing with hunspell %description devel Includes and definitions for developing with hunspell +%package filesystem +Summary: Hunspell filesystem layout + +%description filesystem +Provides a directory in which to store dictionaries provided by other +packages. + %prep %setup -q %patch0 -p1 -b .CVE-2019-16707 @@ -92,7 +100,6 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %files -f %{name}.lang %doc README COPYING COPYING.LESSER COPYING.MPL AUTHORS license.hunspell license.myspell THANKS %{_libdir}/*.so.* -%{_datadir}/myspell %{_bindir}/hunspell %{_mandir}/man1/hunspell.1.gz %lang(hu) %{_mandir}/hu/man1/hunspell.1.gz @@ -117,7 +124,13 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_mandir}/man3/hunspell.3.gz %{_mandir}/man5/hunspell.5.gz +%files filesystem +%{_datadir}/myspell + %changelog +* Wed Feb 03 2021 Peter Oliver - 1.7.0-9 +- Accomodate Nuspell by putting the dictionary dir in its own subpackage. + * Tue Jan 26 2021 Fedora Release Engineering - 1.7.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 246b0167354083aea7a5b584e82212605b7c1c62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 25 Mar 2021 14:49:16 +0000 Subject: [PATCH 14/44] Resolves: rhbz#1943087 require gettext-devel for autopoint --- hunspell.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hunspell.spec b/hunspell.spec index c679b9a..3c881f4 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,12 +3,12 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 9%{?dist} +Release: 10%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 BuildRequires: gcc-c++ -BuildRequires: autoconf, automake, libtool, ncurses-devel, gettext +BuildRequires: autoconf, automake, libtool, ncurses-devel, gettext-devel BuildRequires: perl-generators %ifarch %{ix86} x86_64 BuildRequires: valgrind @@ -128,6 +128,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Thu Mar 25 2021 Caolán McNamara - 1.7.0-10 +- Resolves: rhbz#1943087 require gettext-devel for autopoint + * Wed Feb 03 2021 Peter Oliver - 1.7.0-9 - Accomodate Nuspell by putting the dictionary dir in its own subpackage. From d6ddef06e5753b283e738fa9fe171b50f0a327d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 07:48:31 +0000 Subject: [PATCH 15/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index 3c881f4..dfdf690 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 10%{?dist} +Release: 11%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -128,6 +128,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.7.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Mar 25 2021 Caolán McNamara - 1.7.0-10 - Resolves: rhbz#1943087 require gettext-devel for autopoint From 6ffc0420776b66ded380d5792eaca8bc4ef5738d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 12:31:52 +0000 Subject: [PATCH 16/44] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index dfdf690..0e7a1e6 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 11%{?dist} +Release: 12%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -128,6 +128,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.7.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 1.7.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 09babb9078789004d270e8b7369279cdad64fd73 Mon Sep 17 00:00:00 2001 From: vishalvvr Date: Fri, 21 Jan 2022 17:21:19 +0530 Subject: [PATCH 17/44] update default dictionary install path - rename install dir name from myspell to hunspell - create symlink myspell for better backward compatibility - https://fedoraproject.org/wiki/Changes/Hunspell_dictionary_dir_change --- hunspell.spec | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/hunspell.spec b/hunspell.spec index 0e7a1e6..b40cf2b 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 12%{?dist} +Release: 13%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -18,7 +18,7 @@ BuildRequires: words %endif BuildRequires: make Requires: hunspell-en-US -Requires: hunspell-filesystem +Requires: hunspell-filesystem = %{version}-%{release} Patch0: 0001-invalid-read-memory-access-624.patch @@ -92,11 +92,30 @@ rm -rf $RPM_BUILD_ROOT %make_install rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la +%if 0%{?fedora} > 35 +mkdir $RPM_BUILD_ROOT/%{_datadir}/hunspell +%else mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell +%endif %find_lang %{name} %ldconfig_scriptlets +%if 0%{?fedora} > 35 +%pretrans -p +-- Rename dir from myspell to hunspell +-- DO NOT add a trailing slash at the end. +old_path = "/usr/share/myspell" +new_path = "/usr/share/hunspell" +st = posix.stat(old_path) +if st and st.type == "directory" then + status = os.rename(old_path, new_path) +end + +%post +%__ln_s %{_datadir}/hunspell %{_datadir}/myspell +%endif + %files -f %{name}.lang %doc README COPYING COPYING.LESSER COPYING.MPL AUTHORS license.hunspell license.myspell THANKS %{_libdir}/*.so.* @@ -125,9 +144,18 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_mandir}/man5/hunspell.5.gz %files filesystem +%if 0%{?fedora} > 35 +%ghost %{_datadir}/myspell +%{_datadir}/hunspell +%else %{_datadir}/myspell +%endif %changelog +* Fri Jan 21 2022 Vishal Vijayraghavan - 1.7.0-13 +- Rename install dir from myspell to hunspell & create symlink myspell +- https://fedoraproject.org/wiki/Changes/Hunspell_dictionary_dir_change + * Thu Jan 20 2022 Fedora Release Engineering - 1.7.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 4f0c047284743b8afe5a728e00d396651e0db5db Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 26 Jan 2022 11:16:34 +0800 Subject: [PATCH 18/44] add "Requires(post): coreutils" to unbreak compose (#2045568) --- hunspell.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index b40cf2b..6323d44 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 13%{?dist} +Release: 14%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -19,6 +19,7 @@ BuildRequires: words BuildRequires: make Requires: hunspell-en-US Requires: hunspell-filesystem = %{version}-%{release} +Requires(post): coreutils Patch0: 0001-invalid-read-memory-access-624.patch @@ -152,6 +153,9 @@ end %endif %changelog +* Wed Jan 26 2022 Jens Petersen - 1.7.0-14 +- requires coreutils for post script (#2045568) + * Fri Jan 21 2022 Vishal Vijayraghavan - 1.7.0-13 - Rename install dir from myspell to hunspell & create symlink myspell - https://fedoraproject.org/wiki/Changes/Hunspell_dictionary_dir_change From f02139cd19ddd270a8bed13c83f06b0d2f8abc0e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 26 Jan 2022 23:11:13 +0800 Subject: [PATCH 19/44] add checks to post and pretrans --- hunspell.spec | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/hunspell.spec b/hunspell.spec index 6323d44..d04b6a6 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 14%{?dist} +Release: 15%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -106,15 +106,18 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %pretrans -p -- Rename dir from myspell to hunspell -- DO NOT add a trailing slash at the end. -old_path = "/usr/share/myspell" -new_path = "/usr/share/hunspell" -st = posix.stat(old_path) -if st and st.type == "directory" then - status = os.rename(old_path, new_path) +old_path = "%{_datadir}/myspell" +new_path = "%{_datadir}/hunspell" +old_st = posix.stat(old_path) +new_st = posix.stat(new_path) +if old_st and old_st.type == "directory" and not new_st then + os.rename(old_path, new_path) end -%post -%__ln_s %{_datadir}/hunspell %{_datadir}/myspell +%post -p +if not posix.stat("%{_datadir}/myspell") then + posix.symlink("%{_datadir}/hunspell", "%{_datadir}/myspell") +end %endif %files -f %{name}.lang @@ -153,6 +156,11 @@ end %endif %changelog +* Wed Jan 26 2022 Jens Petersen - 1.7.0-15 +- improve the filesystem pretrans and post scripts: +- pretrans now checks if /usr/share/hunspell exists first +- post checks that /usr/share/myspell does not exist + * Wed Jan 26 2022 Jens Petersen - 1.7.0-14 - requires coreutils for post script (#2045568) From b3b504b133d8f62ee04148a02576b2b8f05598b2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 27 Jan 2022 11:28:53 +0800 Subject: [PATCH 20/44] drop "Requires(post): coreutils" since post now uses lua script --- hunspell.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index d04b6a6..263dbf7 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -19,7 +19,6 @@ BuildRequires: words BuildRequires: make Requires: hunspell-en-US Requires: hunspell-filesystem = %{version}-%{release} -Requires(post): coreutils Patch0: 0001-invalid-read-memory-access-624.patch From 80770886a515d9dd9c704ab992e6f440f793e1af Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 7 Feb 2022 16:03:57 +0800 Subject: [PATCH 21/44] pretrans and post scriptlets should be for filesystem! (#2051360) --- hunspell.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hunspell.spec b/hunspell.spec index 263dbf7..a88b471 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 15%{?dist} +Release: 16%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -23,9 +23,9 @@ Requires: hunspell-filesystem = %{version}-%{release} Patch0: 0001-invalid-read-memory-access-624.patch %description -Hunspell is a spell checker and morphological analyzer library and program -designed for languages with rich morphology and complex word compounding or -character encoding. Hunspell interfaces: Ispell-like terminal interface using +Hunspell is a spell checker and morphological analyzer library and program +designed for languages with rich morphology and complex word compounding or +character encoding. Hunspell interfaces: Ispell-like terminal interface using Curses library, Ispell pipe interface, LibreOffice UNO module. %package devel @@ -102,7 +102,7 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %ldconfig_scriptlets %if 0%{?fedora} > 35 -%pretrans -p +%pretrans filesystem -p -- Rename dir from myspell to hunspell -- DO NOT add a trailing slash at the end. old_path = "%{_datadir}/myspell" @@ -113,7 +113,7 @@ if old_st and old_st.type == "directory" and not new_st then os.rename(old_path, new_path) end -%post -p +%post filesystem -p if not posix.stat("%{_datadir}/myspell") then posix.symlink("%{_datadir}/hunspell", "%{_datadir}/myspell") end @@ -155,6 +155,10 @@ end %endif %changelog +* Mon Feb 7 2022 Jens Petersen - 1.7.0-16 +- pretrans and post scriptlets should be for filesystem! + (fixes #2051360 regression reported by Mike Fabian) + * Wed Jan 26 2022 Jens Petersen - 1.7.0-15 - improve the filesystem pretrans and post scripts: - pretrans now checks if /usr/share/hunspell exists first From 07fa42d0d1075445d1330b9070298e273e40da0d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 10 Feb 2022 16:09:23 +0800 Subject: [PATCH 22/44] use fedora ">= 36" for the hunspell/ dir conditionals --- hunspell.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hunspell.spec b/hunspell.spec index a88b471..3b0b5ba 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -92,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT %make_install rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la -%if 0%{?fedora} > 35 +%if 0%{?fedora} >= 36 mkdir $RPM_BUILD_ROOT/%{_datadir}/hunspell %else mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell @@ -101,7 +101,7 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %ldconfig_scriptlets -%if 0%{?fedora} > 35 +%if 0%{?fedora} >= 36 %pretrans filesystem -p -- Rename dir from myspell to hunspell -- DO NOT add a trailing slash at the end. @@ -147,7 +147,7 @@ end %{_mandir}/man5/hunspell.5.gz %files filesystem -%if 0%{?fedora} > 35 +%if 0%{?fedora} >= 36 %ghost %{_datadir}/myspell %{_datadir}/hunspell %else From 54c1c04c683c48762dd0436f88ae6d6c5bf91ae1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 10 Feb 2022 16:12:15 +0800 Subject: [PATCH 23/44] revert the filesystem %post scriptlet to use bash (#2041930) It broken rpm-ostree composes: https://github.com/coreos/rpm-ostree/issues/3418 --- hunspell.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hunspell.spec b/hunspell.spec index 3b0b5ba..9a05aa2 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -37,6 +37,7 @@ Includes and definitions for developing with hunspell %package filesystem Summary: Hunspell filesystem layout +Requires(post): coreutils %description filesystem Provides a directory in which to store dictionaries provided by other @@ -113,10 +114,10 @@ if old_st and old_st.type == "directory" and not new_st then os.rename(old_path, new_path) end -%post filesystem -p -if not posix.stat("%{_datadir}/myspell") then - posix.symlink("%{_datadir}/hunspell", "%{_datadir}/myspell") -end +%post filesystem +if [ ! -e "%{_datadir}/myspell" ]; then + %__ln_s %{_datadir}/hunspell %{_datadir}/myspell +fi %endif %files -f %{name}.lang From b427c7127245e397d33534516b1fc994cbf2c2f0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 10 Feb 2022 16:30:26 +0800 Subject: [PATCH 24/44] bump release for the shell %post fix --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index 9a05aa2..c29037f 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 16%{?dist} +Release: 17%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -156,6 +156,9 @@ fi %endif %changelog +* Thu Feb 10 2022 Jens Petersen - 1.7.0-17 +- revert post script from lua back to shell to unbreak rpm-ostree compose + * Mon Feb 7 2022 Jens Petersen - 1.7.0-16 - pretrans and post scriptlets should be for filesystem! (fixes #2051360 regression reported by Mike Fabian) From 0954b46d01fed32a768e96d21f2be3e57453d5be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 7 Mar 2022 11:00:13 +0000 Subject: [PATCH 25/44] =?UTF-8?q?Resolves:=20rhbz#2060751=20-=20=E2=80=9Ch?= =?UTF-8?q?unspell=20-D=E2=80=9D=20lists=20dictionaries=20twice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...-t-list-duplicate-dics-from-usr-shar.patch | 26 +++++++++++++++++++ hunspell.spec | 11 +++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-rhbz-2060751-don-t-list-duplicate-dics-from-usr-shar.patch diff --git a/0001-rhbz-2060751-don-t-list-duplicate-dics-from-usr-shar.patch b/0001-rhbz-2060751-don-t-list-duplicate-dics-from-usr-shar.patch new file mode 100644 index 0000000..5e8173f --- /dev/null +++ b/0001-rhbz-2060751-don-t-list-duplicate-dics-from-usr-shar.patch @@ -0,0 +1,26 @@ +From 1d54eddedf6178ca0de6c53514678879541c646a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 7 Mar 2022 10:57:21 +0000 +Subject: [PATCH] rhbz#2060751 don't list duplicate dics from + /usr/share/myspell symlink + +--- + src/tools/hunspell.cxx | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/tools/hunspell.cxx b/src/tools/hunspell.cxx +index 46dd2b6..08eb5b2 100644 +--- a/src/tools/hunspell.cxx ++++ b/src/tools/hunspell.cxx +@@ -117,8 +117,6 @@ + + #define LIBDIR \ + "/usr/share/hunspell:" \ +- "/usr/share/myspell:" \ +- "/usr/share/myspell/dicts:" \ + "/Library/Spelling" + #define USEROOODIR { \ + ".openoffice.org/3/user/wordbook", \ +-- +2.35.1 + diff --git a/hunspell.spec b/hunspell.spec index c29037f..58053b5 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 17%{?dist} +Release: 18%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -21,6 +21,9 @@ Requires: hunspell-en-US Requires: hunspell-filesystem = %{version}-%{release} Patch0: 0001-invalid-read-memory-access-624.patch +%if 0%{?fedora} >= 36 +Patch1: 0001-rhbz-2060751-don-t-list-duplicate-dics-from-usr-shar.patch +%endif %description Hunspell is a spell checker and morphological analyzer library and program @@ -46,6 +49,9 @@ packages. %prep %setup -q %patch0 -p1 -b .CVE-2019-16707 +%if 0%{?fedora} >= 36 +%patch1 -p1 -b .rhbz-2060751 +%endif %build autoreconf -vfi @@ -156,6 +162,9 @@ fi %endif %changelog +* Mon Mar 07 2022 Caolán McNamara - 1.7.0-18 +- Resolves: rhbz#2060751 - “hunspell -D” lists dictionaries twice + * Thu Feb 10 2022 Jens Petersen - 1.7.0-17 - revert post script from lua back to shell to unbreak rpm-ostree compose From 5e321c5e7bd91babbb443dd2a28f4fee05efcd12 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 16 Mar 2022 11:50:57 +0800 Subject: [PATCH 26/44] revert the myspell compat symlink changes (rhbz#2064189) relative to 6ffc042, the only change now is really to add /usr/share/hunspell to filesystem This should also help with rpm-ostree, eg Silverblue 36: currently dictionaries still in myspell/ can't be installed (upgraded). So this simplifies things a lot and seems much cleaner both pretrans and post for filesystem are gone. The only downside is that any legacy apps with hardcoded /usr/share/myspell might stop working for spellchecking. Perhaps a hunspell-filesystem-compat package could be added later to carry the symlink once all the Fedora dicts have been moved. --- ...-t-list-duplicate-dics-from-usr-shar.patch | 26 ----------- hunspell.spec | 43 ++++--------------- 2 files changed, 9 insertions(+), 60 deletions(-) delete mode 100644 0001-rhbz-2060751-don-t-list-duplicate-dics-from-usr-shar.patch diff --git a/0001-rhbz-2060751-don-t-list-duplicate-dics-from-usr-shar.patch b/0001-rhbz-2060751-don-t-list-duplicate-dics-from-usr-shar.patch deleted file mode 100644 index 5e8173f..0000000 --- a/0001-rhbz-2060751-don-t-list-duplicate-dics-from-usr-shar.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1d54eddedf6178ca0de6c53514678879541c646a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Mon, 7 Mar 2022 10:57:21 +0000 -Subject: [PATCH] rhbz#2060751 don't list duplicate dics from - /usr/share/myspell symlink - ---- - src/tools/hunspell.cxx | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/tools/hunspell.cxx b/src/tools/hunspell.cxx -index 46dd2b6..08eb5b2 100644 ---- a/src/tools/hunspell.cxx -+++ b/src/tools/hunspell.cxx -@@ -117,8 +117,6 @@ - - #define LIBDIR \ - "/usr/share/hunspell:" \ -- "/usr/share/myspell:" \ -- "/usr/share/myspell/dicts:" \ - "/Library/Spelling" - #define USEROOODIR { \ - ".openoffice.org/3/user/wordbook", \ --- -2.35.1 - diff --git a/hunspell.spec b/hunspell.spec index 58053b5..1613e7a 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 18%{?dist} +Release: 19%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -21,9 +21,6 @@ Requires: hunspell-en-US Requires: hunspell-filesystem = %{version}-%{release} Patch0: 0001-invalid-read-memory-access-624.patch -%if 0%{?fedora} >= 36 -Patch1: 0001-rhbz-2060751-don-t-list-duplicate-dics-from-usr-shar.patch -%endif %description Hunspell is a spell checker and morphological analyzer library and program @@ -40,7 +37,6 @@ Includes and definitions for developing with hunspell %package filesystem Summary: Hunspell filesystem layout -Requires(post): coreutils %description filesystem Provides a directory in which to store dictionaries provided by other @@ -49,9 +45,6 @@ packages. %prep %setup -q %patch0 -p1 -b .CVE-2019-16707 -%if 0%{?fedora} >= 36 -%patch1 -p1 -b .rhbz-2060751 -%endif %build autoreconf -vfi @@ -99,33 +92,12 @@ rm -rf $RPM_BUILD_ROOT %make_install rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la -%if 0%{?fedora} >= 36 mkdir $RPM_BUILD_ROOT/%{_datadir}/hunspell -%else mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell -%endif %find_lang %{name} %ldconfig_scriptlets -%if 0%{?fedora} >= 36 -%pretrans filesystem -p --- Rename dir from myspell to hunspell --- DO NOT add a trailing slash at the end. -old_path = "%{_datadir}/myspell" -new_path = "%{_datadir}/hunspell" -old_st = posix.stat(old_path) -new_st = posix.stat(new_path) -if old_st and old_st.type == "directory" and not new_st then - os.rename(old_path, new_path) -end - -%post filesystem -if [ ! -e "%{_datadir}/myspell" ]; then - %__ln_s %{_datadir}/hunspell %{_datadir}/myspell -fi -%endif - %files -f %{name}.lang %doc README COPYING COPYING.LESSER COPYING.MPL AUTHORS license.hunspell license.myspell THANKS %{_libdir}/*.so.* @@ -154,14 +126,17 @@ fi %{_mandir}/man5/hunspell.5.gz %files filesystem -%if 0%{?fedora} >= 36 -%ghost %{_datadir}/myspell %{_datadir}/hunspell -%else %{_datadir}/myspell -%endif %changelog +* Wed Mar 16 2022 Jens Petersen - 1.7.0-19 +- rework the new hunspell dictionary directory (#2064189) +- drop the myspell/ compatibility symlink +- keep myspell/ as directory and also the new hunspell/ dir +- because of this drop the duplicate directory patch for #2060751 +- filesystem scriptlets are no more + * Mon Mar 07 2022 Caolán McNamara - 1.7.0-18 - Resolves: rhbz#2060751 - “hunspell -D” lists dictionaries twice @@ -424,7 +399,7 @@ fi - sort as per "C" locale * Fri Oct 17 2008 Caolán McNamara - 1.2.7-4 -- make wordlist2hunspell remove blank lines +- make wordlist2hunspell remove blank lines * Mon Sep 15 2008 Caolán McNamara - 1.2.7-3 - Workaround rhbz#462184 uniq/sort problems with viramas From dad93af3179c3399dc46e7f7eecd1090362ec27b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 13:50:40 +0000 Subject: [PATCH 27/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index 1613e7a..d878f53 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 19%{?dist} +Release: 20%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -130,6 +130,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.7.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Mar 16 2022 Jens Petersen - 1.7.0-19 - rework the new hunspell dictionary directory (#2064189) - drop the myspell/ compatibility symlink From deb7fb454439df3af05620f6615b408acecda23d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 2 Aug 2022 09:20:35 +0100 Subject: [PATCH 28/44] Resolves: rhbz#2113444 FTBFS --- Werror-format-security.patch | 11 +++++++++++ hunspell.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 Werror-format-security.patch diff --git a/Werror-format-security.patch b/Werror-format-security.patch new file mode 100644 index 0000000..56b06a5 --- /dev/null +++ b/Werror-format-security.patch @@ -0,0 +1,11 @@ +--- a/src/tools/hunspell.cxx 2022-08-02 09:18:13.525748669 +0100 ++++ b/src/tools/hunspell.cxx 2022-08-02 09:18:38.598006933 +0100 +@@ -581,7 +581,7 @@ + #ifdef HAVE_CURSES_H + char* scanline(char* message) { + char input[INPUTLEN]; +- printw(message); ++ printw("%s", message); + echo(); + getnstr(input, INPUTLEN); + noecho(); diff --git a/hunspell.spec b/hunspell.spec index d878f53..234f2dd 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.0 -Release: 20%{?dist} +Release: 21%{?dist} Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -21,6 +21,7 @@ Requires: hunspell-en-US Requires: hunspell-filesystem = %{version}-%{release} Patch0: 0001-invalid-read-memory-access-624.patch +Patch1: Werror-format-security.patch %description Hunspell is a spell checker and morphological analyzer library and program @@ -45,6 +46,7 @@ packages. %prep %setup -q %patch0 -p1 -b .CVE-2019-16707 +%patch1 -p1 -b .Werror-format-security %build autoreconf -vfi @@ -130,6 +132,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Tue Aug 02 2022 Caolán McNamara - 1.7.0-21 +- Resolves: rhbz#2113444 FTBFS + * Thu Jul 21 2022 Fedora Release Engineering - 1.7.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 34f2c9f0536357216a70f7be22776d6abcc94c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 2 Aug 2022 09:50:08 +0100 Subject: [PATCH 29/44] double_profiling_build fails for i686 --- hunspell.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index 234f2dd..0d71653 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -1,4 +1,4 @@ -%define double_profiling_build 1 +%define double_profiling_build 0 Name: hunspell Summary: A spell checker and morphological analyzer library From 5030cda6b33520116dad13245936f8a4783fdf65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 2 Aug 2022 10:15:43 +0100 Subject: [PATCH 30/44] restore for next attempt --- hunspell.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index 0d71653..234f2dd 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -1,4 +1,4 @@ -%define double_profiling_build 0 +%define double_profiling_build 1 Name: hunspell Summary: A spell checker and morphological analyzer library From c1da243e3a8d53b180218d891bd13fc8d1e94ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 22 Aug 2022 15:02:38 +0100 Subject: [PATCH 31/44] latest release --- .gitignore | 2 +- 0001-invalid-read-memory-access-624.patch | 25 ----------------------- Werror-format-security.patch | 11 ---------- hunspell.spec | 14 ++++++------- sources | 2 +- 5 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 0001-invalid-read-memory-access-624.patch delete mode 100644 Werror-format-security.patch diff --git a/.gitignore b/.gitignore index eb11a9d..fa61aab 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/v1.7.0.tar.gz +/hunspell-1.7.1.tar.gz diff --git a/0001-invalid-read-memory-access-624.patch b/0001-invalid-read-memory-access-624.patch deleted file mode 100644 index 66b55e7..0000000 --- a/0001-invalid-read-memory-access-624.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 12 Nov 2019 20:03:15 +0000 -Subject: [PATCH] invalid read memory access #624 - ---- - src/hunspell/suggestmgr.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx -index dba084e..c23f165 100644 ---- a/src/hunspell/suggestmgr.cxx -+++ b/src/hunspell/suggestmgr.cxx -@@ -2040,7 +2040,7 @@ int SuggestMgr::leftcommonsubstring( - int l2 = su2.size(); - // decapitalize dictionary word - if (complexprefixes) { -- if (su1[l1 - 1] == su2[l2 - 1]) -+ if (l1 && l2 && su1[l1 - 1] == su2[l2 - 1]) - return 1; - } else { - unsigned short idx = su2.empty() ? 0 : (su2[0].h << 8) + su2[0].l; --- -2.23.0 - diff --git a/Werror-format-security.patch b/Werror-format-security.patch deleted file mode 100644 index 56b06a5..0000000 --- a/Werror-format-security.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/tools/hunspell.cxx 2022-08-02 09:18:13.525748669 +0100 -+++ b/src/tools/hunspell.cxx 2022-08-02 09:18:38.598006933 +0100 -@@ -581,7 +581,7 @@ - #ifdef HAVE_CURSES_H - char* scanline(char* message) { - char input[INPUTLEN]; -- printw(message); -+ printw("%s", message); - echo(); - getnstr(input, INPUTLEN); - noecho(); diff --git a/hunspell.spec b/hunspell.spec index 234f2dd..57ea1c0 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -2,9 +2,9 @@ Name: hunspell Summary: A spell checker and morphological analyzer library -Version: 1.7.0 -Release: 21%{?dist} -Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz +Version: 1.7.1 +Release: 1%{?dist} +Source: https://github.com/hunspell/hunspell/releases/download/v%{version}/hunspell-%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 BuildRequires: gcc-c++ @@ -20,9 +20,6 @@ BuildRequires: make Requires: hunspell-en-US Requires: hunspell-filesystem = %{version}-%{release} -Patch0: 0001-invalid-read-memory-access-624.patch -Patch1: Werror-format-security.patch - %description Hunspell is a spell checker and morphological analyzer library and program designed for languages with rich morphology and complex word compounding or @@ -45,8 +42,6 @@ packages. %prep %setup -q -%patch0 -p1 -b .CVE-2019-16707 -%patch1 -p1 -b .Werror-format-security %build autoreconf -vfi @@ -132,6 +127,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Mon Aug 22 2022 Caolán McNamara - 1.7.1-1 +- latest release + * Tue Aug 02 2022 Caolán McNamara - 1.7.0-21 - Resolves: rhbz#2113444 FTBFS diff --git a/sources b/sources index 07935b9..4990421 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.7.0.tar.gz) = 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 +SHA512 (hunspell-1.7.1.tar.gz) = e177fadd39e89abf47c6cec7d12d1976d21af5c924fb62402433af202c07db50156cd9f60ceae44952b05740e76a98548afb7ac12b666a9fa170ef52e6f8e808 From 54639a08a5957dff23e5ec9bdc972441ae62a560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 14 Sep 2022 10:21:09 +0100 Subject: [PATCH 32/44] don't need update-gmo target when using tarballs from 'make dist' again --- hunspell.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index 57ea1c0..e0b16d6 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -76,7 +76,6 @@ make distclean %{profileuse} %configure $configureflags %make_build %endif -cd po && %make_build update-gmo && cd .. %check %ifarch %{ix86} x86_64 From 8ac6886a8ade8e2a840aca56b88f232a4e9ffe44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 30 Dec 2022 14:20:15 +0000 Subject: [PATCH 33/44] Resolves: rhbz#2157049 latest release --- .gitignore | 2 +- hunspell.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fa61aab..088efb4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/hunspell-1.7.1.tar.gz +/hunspell-1.7.2.tar.gz diff --git a/hunspell.spec b/hunspell.spec index e0b16d6..13924d8 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -2,7 +2,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library -Version: 1.7.1 +Version: 1.7.2 Release: 1%{?dist} Source: https://github.com/hunspell/hunspell/releases/download/v%{version}/hunspell-%{version}.tar.gz URL: https://github.com/hunspell/hunspell @@ -126,6 +126,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Fri Dec 30 2022 Caolán McNamara - 1.7.2-1 +- Resolves: rhbz#2157049 latest release + * Mon Aug 22 2022 Caolán McNamara - 1.7.1-1 - latest release diff --git a/sources b/sources index 4990421..0338530 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hunspell-1.7.1.tar.gz) = e177fadd39e89abf47c6cec7d12d1976d21af5c924fb62402433af202c07db50156cd9f60ceae44952b05740e76a98548afb7ac12b666a9fa170ef52e6f8e808 +SHA512 (hunspell-1.7.2.tar.gz) = 49b3619bff12e111b6cc3f3d9463612b116f9b2a976896718e65f5bc4a83ece11100aaf56a4d18127ea39107446c495e12affe5ff3c9159ae8aba70e512f44ac From 40b55e12ac0671122946c4230c37c3bec9df642a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 6 Jan 2023 16:26:51 +0000 Subject: [PATCH 34/44] Resolves: rhbz#2158548 get hunspell-ko working again --- ...58548-allow-longer-words-for-hunspel.patch | 77 +++++++++++++++++++ hunspell.spec | 8 +- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 0001-Resolves-rhbz-2158548-allow-longer-words-for-hunspel.patch diff --git a/0001-Resolves-rhbz-2158548-allow-longer-words-for-hunspel.patch b/0001-Resolves-rhbz-2158548-allow-longer-words-for-hunspel.patch new file mode 100644 index 0000000..c0225fb --- /dev/null +++ b/0001-Resolves-rhbz-2158548-allow-longer-words-for-hunspel.patch @@ -0,0 +1,77 @@ +From e2fe9f86e1769b440972971240e9b8fb1cd53b97 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Fri, 6 Jan 2023 16:20:45 +0000 +Subject: [PATCH] Resolves: rhbz#2158548 allow longer words for hunspell-ko +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +https://github.com/hunspell/hunspell/issues/903 + +A problem since the sanity check added in: + +commit 05e44e069e4cfaa9ce1264bf13f23fc9abd7ed05 +Author: Caolán McNamara +Date: Thu Sep 1 13:46:40 2022 +0100 + + Check word limit (#813) + + * check against hentry blen max +--- + src/hunspell/hashmgr.cxx | 6 +++--- + src/hunspell/htypes.hxx | 4 ++-- + tests/korean.dic | 3 ++- + 3 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/hunspell/hashmgr.cxx b/src/hunspell/hashmgr.cxx +index 100916d..14201e9 100644 +--- a/src/hunspell/hashmgr.cxx ++++ b/src/hunspell/hashmgr.cxx +@@ -209,7 +209,7 @@ int HashMgr::add_word(const std::string& in_word, + } + + // limit of hp->blen +- if (word->size() > std::numeric_limits::max()) { ++ if (word->size() > std::numeric_limits::max()) { + HUNSPELL_WARNING(stderr, "error: word len %ld is over max limit\n", word->size()); + delete desc_copy; + delete word_copy; +@@ -235,8 +235,8 @@ int HashMgr::add_word(const std::string& in_word, + + int i = hash(hpw, word->size()); + +- hp->blen = (unsigned char)word->size(); +- hp->clen = (unsigned char)wcl; ++ hp->blen = (unsigned short)word->size(); ++ hp->clen = (unsigned short)wcl; + hp->alen = (short)al; + hp->astr = aff; + hp->next = NULL; +diff --git a/src/hunspell/htypes.hxx b/src/hunspell/htypes.hxx +index 44366b1..2b896fb 100644 +--- a/src/hunspell/htypes.hxx ++++ b/src/hunspell/htypes.hxx +@@ -62,8 +62,8 @@ + #endif + + struct hentry { +- unsigned char blen; // word length in bytes +- unsigned char clen; // word length in characters (different for UTF-8 enc.) ++ unsigned short blen; // word length in bytes ++ unsigned short clen; // word length in characters (different for UTF-8 enc.) + short alen; // length of affix flag vector + unsigned short* astr; // affix flag vector + struct hentry* next; // next word with same hash code +diff --git a/tests/korean.dic b/tests/korean.dic +index 95cb450..d76ea05 100644 +--- a/tests/korean.dic ++++ b/tests/korean.dic +@@ -1,3 +1,4 @@ +-2 ++3 + 들어오세요 + 안녕하세요 ++김수한무거북이와두루미삼천갑자동방삭치치카포사리사리세ᅡ워리워리세브리캉무드셀ᅡ구름위허ᅵ케ᅵᆫᅦ담벼락서생원에ᄀ양 +-- +2.38.1 + diff --git a/hunspell.spec b/hunspell.spec index 13924d8..55fa90d 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.2 -Release: 1%{?dist} +Release: 2%{?dist} Source: https://github.com/hunspell/hunspell/releases/download/v%{version}/hunspell-%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -20,6 +20,8 @@ BuildRequires: make Requires: hunspell-en-US Requires: hunspell-filesystem = %{version}-%{release} +Patch0: 0001-Resolves-rhbz-2158548-allow-longer-words-for-hunspel.patch + %description Hunspell is a spell checker and morphological analyzer library and program designed for languages with rich morphology and complex word compounding or @@ -42,6 +44,7 @@ packages. %prep %setup -q +%patch0 -p1 -b .rhbz2158548 %build autoreconf -vfi @@ -126,6 +129,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Fri Jan 06 2023 Caolán McNamara - 1.7.2-2 +- Resolves: rhbz#2158548 get hunspell-ko working again + * Fri Dec 30 2022 Caolán McNamara - 1.7.2-1 - Resolves: rhbz#2157049 latest release From 937564ad745110bd982e18551a7a6c62c49d93f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 12:19:37 +0000 Subject: [PATCH 35/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index 55fa90d..38785ec 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.2 -Release: 2%{?dist} +Release: 3%{?dist} Source: https://github.com/hunspell/hunspell/releases/download/v%{version}/hunspell-%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 @@ -129,6 +129,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.7.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jan 06 2023 Caolán McNamara - 1.7.2-2 - Resolves: rhbz#2158548 get hunspell-ko working again From 868e83e3e859c2b031256a9b1c315c7bda3648ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 22 Feb 2023 10:18:50 +0000 Subject: [PATCH 36/44] migrated to SPDX license --- hunspell.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hunspell.spec b/hunspell.spec index 38785ec..9e3f304 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,10 +3,10 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.2 -Release: 3%{?dist} +Release: 4%{?dist} Source: https://github.com/hunspell/hunspell/releases/download/v%{version}/hunspell-%{version}.tar.gz URL: https://github.com/hunspell/hunspell -License: LGPLv2+ or GPLv2+ or MPLv1.1 +License: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-1.1 BuildRequires: gcc-c++ BuildRequires: autoconf, automake, libtool, ncurses-devel, gettext-devel BuildRequires: perl-generators @@ -129,6 +129,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Wed Feb 22 2023 Caolán McNamara - 1.7.2-4 +- migrated to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 1.7.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 5675a2c4008be67ad442801eb5d436e16d382b58 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 06:31:47 +0000 Subject: [PATCH 37/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index 9e3f304..b81d6c1 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.2 -Release: 4%{?dist} +Release: 5%{?dist} Source: https://github.com/hunspell/hunspell/releases/download/v%{version}/hunspell-%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-1.1 @@ -129,6 +129,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.7.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Feb 22 2023 Caolán McNamara - 1.7.2-4 - migrated to SPDX license From 6f346206b8d9755f2fa0ad5de915d0554cbd9b4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 22:17:15 +0000 Subject: [PATCH 38/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index b81d6c1..dd9e194 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.2 -Release: 5%{?dist} +Release: 6%{?dist} Source: https://github.com/hunspell/hunspell/releases/download/v%{version}/hunspell-%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-1.1 @@ -129,6 +129,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 1.7.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 1.7.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ad33f2f898299645b237f976f4cc160ce991c07c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 21:51:55 +0000 Subject: [PATCH 39/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index dd9e194..689c53d 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.2 -Release: 6%{?dist} +Release: 7%{?dist} Source: https://github.com/hunspell/hunspell/releases/download/v%{version}/hunspell-%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-1.1 @@ -129,6 +129,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.7.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 1.7.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f4c35362a1bbd294636706661bfaa97d4ff55daa Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 40/44] Eliminate use of obsolete %patchN syntax (#2283636) --- hunspell.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index 689c53d..f33649f 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -44,7 +44,7 @@ packages. %prep %setup -q -%patch0 -p1 -b .rhbz2158548 +%patch -P0 -p1 -b .rhbz2158548 %build autoreconf -vfi From 84708febe12f690367620db784767f09f703f738 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 09:27:28 +0000 Subject: [PATCH 41/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index f33649f..d012f3c 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.2 -Release: 7%{?dist} +Release: 8%{?dist} Source: https://github.com/hunspell/hunspell/releases/download/v%{version}/hunspell-%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-1.1 @@ -129,6 +129,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.7.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 1.7.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e8c3928ddbdbfcec1ddf54876d73e8596a4f4935 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 06:08:55 +0000 Subject: [PATCH 42/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index d012f3c..d303a36 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.2 -Release: 8%{?dist} +Release: 9%{?dist} Source: https://github.com/hunspell/hunspell/releases/download/v%{version}/hunspell-%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-1.1 @@ -129,6 +129,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.7.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 1.7.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 34553d821a255bd7d80b38b1ac075a7eaab09a42 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Fri, 30 May 2025 11:59:30 +0530 Subject: [PATCH 43/44] Add tmt testcase for CI --- .fmf/version | 1 + plans/hunspell.fmf | 5 ++++ tests/data.txt | 4 ++++ tests/main.fmf | 5 ++++ tests/run_tests.sh | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/hunspell.fmf create mode 100644 tests/data.txt create mode 100644 tests/main.fmf create mode 100644 tests/run_tests.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/hunspell.fmf b/plans/hunspell.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/hunspell.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/data.txt b/tests/data.txt new file mode 100644 index 0000000..29c358c --- /dev/null +++ b/tests/data.txt @@ -0,0 +1,4 @@ +Cloud +Linux +Fedora +Fedoraaa diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..ebec85f --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,5 @@ +require: +- hunspell +- hunspell-de +test: bash ./run_tests.sh +framework: shell diff --git a/tests/run_tests.sh b/tests/run_tests.sh new file mode 100644 index 0000000..7d75074 --- /dev/null +++ b/tests/run_tests.sh @@ -0,0 +1,58 @@ +#!/bin/bash + +check_pkg() { + local pkg=$1 + if rpm -q $pkg + then + echo "PASS" + else + echo "FAIL" + fi +} + +check_dict() { + if [ -f "/usr/share/hunspell/de_DE.dic" ] + then + echo "PASS" + else + echo "FAIL" + fi +} + +check_misspelled_word() { + VAR1="Fedoraaa" + VAR2=$(hunspell -l data.txt) + if [ "$VAR1" = "$VAR2" ]; then + echo "PASS" + else + echo "FAIL" + fi +} + +check_misspelled_line() { + VAR1="Fedoraaa" + VAR2=$(hunspell -L data.txt) + if [ "$VAR1" = "$VAR2" ]; then + echo "PASS" + else + echo "FAIL" + fi +} + +check_correct_word() { + VAR1="Cloud\nLinux\nFedora" + VAR1=$(echo -e "$VAR1") + VAR2=$(hunspell -G data.txt) + if [ "$VAR1" = "$VAR2" ]; then + echo "PASS" + else + echo "FAIL" + fi +} + +check_pkg "hunspell" +check_pkg "hunspell-de" +check_dict +check_misspelled_word +check_misspelled_line +check_correct_word From ec71712f5c4b07db1cdcc185e91ce15234a8fcc8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:08:34 +0000 Subject: [PATCH 44/44] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- hunspell.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hunspell.spec b/hunspell.spec index d303a36..2e62287 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -3,7 +3,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.7.2 -Release: 9%{?dist} +Release: 10%{?dist} Source: https://github.com/hunspell/hunspell/releases/download/v%{version}/hunspell-%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-1.1 @@ -129,6 +129,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.7.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 1.7.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild