!10 软件包加固第三期 enchant2升级
From: @lutkunpeng Reviewed-by: @Charlie_li Signed-off-by: @Charlie_li
This commit is contained in:
commit
474e752e06
@ -1,44 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
Binary file not shown.
BIN
enchant-2.3.3.tar.gz
Normal file
BIN
enchant-2.3.3.tar.gz
Normal file
Binary file not shown.
@ -1,11 +1,11 @@
|
|||||||
Name: enchant2
|
Name: enchant2
|
||||||
Version: 2.2.15
|
Version: 2.3.3
|
||||||
Release: 2
|
Release: 1
|
||||||
Summary: Generic spell checking library
|
Summary: Generic spell checking library
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://github.com/AbiWord/enchant
|
URL: https://github.com/AbiWord/enchant
|
||||||
Source0: https://github.com/AbiWord/enchant/releases/download/v%{version}/enchant-%{version}.tar.gz
|
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
|
BuildRequires: automake autoconf libtool gcc-c++ glib2-devel aspell-devel hunspell-devel libvoikko-devel
|
||||||
|
|
||||||
@ -94,6 +94,9 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g;
|
|||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 15 2022 lutcunpeng <lutkunpeng@163.com> - 2.3.3-1
|
||||||
|
- DESC: update to 2.3.3
|
||||||
|
|
||||||
* Thu Apr 29 2021 zhaoyuxing <zhaoyuxing2@huawei.com> - 2.2.15-2
|
* Thu Apr 29 2021 zhaoyuxing <zhaoyuxing2@huawei.com> - 2.2.15-2
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user