packages/enchant2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!2 delete extra patch

Browse Source 
Merge pull request !2 from jackie_wu123/master
This commit is contained in:
openeuler-ci-bot 2020-01-20 10:19:44 +08:00 committed by Gitee
commit b6d6a14b5c
2 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
enchant2.spec
View File

@ -1,13 +1,11 @@
Name: enchant2 Name: enchant2
Version: 2.2.3 Version: 2.2.3
Release: 6 Release: 7
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
Patch0000: 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
Provides: bundled(gnulib) %{name}-aspell = %{version}-%{release} %{name}-voikko = %{version}-%{release} Provides: bundled(gnulib) %{name}-aspell = %{version}-%{release} %{name}-voikko = %{version}-%{release}
@ -72,5 +70,11 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g;
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Sun Jan 19 2020 wutao <wutao61@huawei.com> - 2.2.3-7
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: modify spec
* Mon Nov 04 2019 huzhiyu <huzhiyu1@huawei.com> - 2.2.3-6 * Mon Nov 04 2019 huzhiyu <huzhiyu1@huawei.com> - 2.2.3-6
- Package init - Package init

23
enchant_aspell.patch
View File

@ -1,23 +0,0 @@
diff -rupN enchant-2.2.3/configure.ac enchant-2.2.3-new/configure.ac
--- enchant-2.2.3/configure.ac 2018-02-04 18:01:08.000000000 +0100
+++ enchant-2.2.3-new/configure.ac 2018-06-15 00:20:14.000000000 +0200
@@ -268,7 +268,7 @@ build_providers=
dnl Standard providers
ENCHANT_CHECK_PKG_CONFIG_PROVIDER([hunspell], [HUNSPELL])
-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 enchant-2.2.3/providers/Makefile.am enchant-2.2.3-new/providers/Makefile.am
--- enchant-2.2.3/providers/Makefile.am 2017-12-12 13:22:28.000000000 +0100
+++ enchant-2.2.3-new/providers/Makefile.am 2018-06-15 00:20:11.000000000 +0200
@@ -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