Resolves: rhbz#2060751 - “hunspell -D” lists dictionaries twice

This commit is contained in:
Caolán McNamara 2022-03-07 11:00:13 +00:00
parent b427c71272
commit 0954b46d01
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From 1d54eddedf6178ca0de6c53514678879541c646a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
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

View File

@ -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 <caolanm@redhat.com> - 1.7.0-18
- Resolves: rhbz#2060751 - “hunspell -D” lists dictionaries twice
* Thu Feb 10 2022 Jens Petersen <petersen@redhat.com> - 1.7.0-17
- revert post script from lua back to shell to unbreak rpm-ostree compose