diff --git a/aspell-0.60.7-fileconflict.patch b/aspell-0.60.7-fileconflict.patch new file mode 100644 index 0000000000000000000000000000000000000000..c4b93155f9759fc18c5a082400aa0d3be752f706 --- /dev/null +++ b/aspell-0.60.7-fileconflict.patch @@ -0,0 +1,55 @@ +diff --git a/Makefile.in b/Makefile.in +index f293649..e5d2b1a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -518,6 +518,7 @@ distcleancheck_listfiles = find . -type f -print + + # These are needed due to a bug in Automake + pkgdatadir = @pkgdatadir@ ++pkgdatadir2 = @pkgdatadir2@ + pkglibdir = @pkglibdir@ + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ +@@ -2071,7 +2072,7 @@ gen/dirs.h: gen/mk-dirs_h.pl + perl ${srcdir}/gen/mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir} ${sysconfdir} > gen/dirs.h + + scripts/run-with-aspell: scripts/run-with-aspell.create +- sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir} > scripts/run-with-aspell ++ sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir2} > scripts/run-with-aspell + chmod 755 scripts/run-with-aspell + @PSPELL_COMPATIBILITY_TRUE@scripts/pspell-config: scripts/mkconfig + @PSPELL_COMPATIBILITY_TRUE@ sh ${srcdir}/scripts/mkconfig ${VERSION} ${datadir} ${pkgdatadir} +diff --git a/configure b/configure +index 1236c90..8a6e697 100755 +--- a/configure ++++ b/configure +@@ -709,6 +709,7 @@ CXXFLAGS + CXX + pkglibdir + pkgdatadir ++pkgdatadir2 + pkgdocdir + MAINT + MAINTAINER_MODE_FALSE +@@ -3297,18 +3298,21 @@ pkgdatadir=undef + # Check whether --enable-pkgdatadir was given. + if test "${enable_pkgdatadir+set}" = set; then : + enableval=$enable_pkgdatadir; pkgdatadir=$enable_pkgdatadir ++ pkgdatadir2=$enable_pkgdatadir + fi + + + # Check whether --enable-pkgdata-dir was given. + if test "${enable_pkgdata_dir+set}" = set; then : + enableval=$enable_pkgdata_dir; pkgdatadir=$enable_dict_dir ++ pkgdatadir2=$enable_dict_dir + fi + + + if test "$pkgdatadir" = "undef" + then + pkgdatadir=\${libdir}/aspell-0.60 ++ pkgdatadir2=${exec_prefix}/lib/aspell-0.60:${exec_prefix}/lib64/aspell-0.60 + fi + + diff --git a/aspell-0.60.7-mp.patch b/aspell-0.60.7-mp.patch new file mode 100644 index 0000000000000000000000000000000000000000..4f4e94dc23abb1f7be61d55d7fc80899b8fb8aed --- /dev/null +++ b/aspell-0.60.7-mp.patch @@ -0,0 +1,48 @@ +diff --git a/manual/aspell.1 b/manual/aspell.1 +index 854debf..b1106ca 100644 +--- a/manual/aspell.1 ++++ b/manual/aspell.1 +@@ -328,7 +328,6 @@ are also allowed. The \fI/etc/aspell.conf\fR file is a good example of + how to set these options and the Aspell Manual has more detailed info. + .SH SEE ALSO + .PP +-.BR aspell\-import (1), + .BR prezip\-bin (1), + .BR run\-with\-aspell (1), + .BR word\-list\-compress (1) +diff --git a/manual/prezip-bin.1 b/manual/prezip-bin.1 +index afb6c05..09b5784 100644 +--- a/manual/prezip-bin.1 ++++ b/manual/prezip-bin.1 +@@ -99,7 +99,6 @@ the output file is not complete. + .SH SEE ALSO + .PP + .BR aspell (1), +-.BR aspell\-import (1), + .BR run\-with\-aspell (1), + .BR word\-list\-compress (1) + .PP +diff --git a/manual/run-with-aspell.1 b/manual/run-with-aspell.1 +index 8dea131..67f3117 100644 +--- a/manual/run-with-aspell.1 ++++ b/manual/run-with-aspell.1 +@@ -28,7 +28,6 @@ such as ispell's own scripts. + .SH SEE ALSO + .PP + .BR aspell (1), +-.BR aspell\-import (1), + .BR word\-list\-compress (1) + .PP + Aspell is fully documented in its Texinfo manual. See the +diff --git a/manual/word-list-compress.1 b/manual/word-list-compress.1 +index 5126cd2..6686997 100644 +--- a/manual/word-list-compress.1 ++++ b/manual/word-list-compress.1 +@@ -80,7 +80,6 @@ be written to. + .SH SEE ALSO + .PP + .BR aspell (1), +-.BR aspell\-import (1), + .BR prezip\-bin (1), + .BR run\-with\-aspell (1) + .PP diff --git a/aspell-0.60.7-pspell_conf.patch b/aspell-0.60.7-pspell_conf.patch new file mode 100644 index 0000000000000000000000000000000000000000..a5fe8e4a4539f4da0f8229ead0ed72de1bd1e539 --- /dev/null +++ b/aspell-0.60.7-pspell_conf.patch @@ -0,0 +1,65 @@ +diff --git a/Makefile.in b/Makefile.in +index e5d2b1a..bc53e34 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1019,6 +1019,8 @@ clean-filterLTLIBRARIES: + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ mkdir -p $(DESTDIR)$(libdir)/pkgconfig; \ ++ cp aspell.pc $(DESTDIR)$(libdir)/pkgconfig/aspell.pc; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ +diff --git a/aspell.pc.in b/aspell.pc.in +new file mode 100644 +index 0000000..13da044 +--- /dev/null ++++ b/aspell.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++pkgdatadir=@pkgdatadir@ ++ ++Name: Aspell ++Description: A spelling checker. ++Version: @VERSION@ ++Requires: ++Libs: -L${libdir} -laspell ++Cflags: -I${includedir} +diff --git a/configure b/configure +index 8a6e697..995a3df 100755 +--- a/configure ++++ b/configure +@@ -18732,7 +18732,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + # # + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # + +-ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile" ++ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile aspell.pc scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -19887,6 +19887,7 @@ do + "modules/filter/Makefile") CONFIG_FILES="$CONFIG_FILES modules/filter/Makefile" ;; + "myspell/Makefile") CONFIG_FILES="$CONFIG_FILES myspell/Makefile" ;; + "lib5/Makefile") CONFIG_FILES="$CONFIG_FILES lib5/Makefile" ;; ++ "aspell.pc") CONFIG_FILES="$CONFIG_FILES aspell.pc" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +diff --git a/scripts/mkconfig b/scripts/mkconfig +index 608e3f7..f15f31c 100755 +--- a/scripts/mkconfig ++++ b/scripts/mkconfig +@@ -15,7 +15,7 @@ case \$1 in + echo "$2" + ;; + --pkgdatadir | pkgdatadir) +- echo "$3" ++ pkg-config aspell --variable=pkgdatadir + ;; + *) + echo "usage: pspell-config version|datadir|pkgdatadir" diff --git a/aspell-0.60.8.tar.gz b/aspell-0.60.8.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..7e4b7664c20017f471dd66a7730d2812c0a880d8 Binary files /dev/null and b/aspell-0.60.8.tar.gz differ diff --git a/aspell.spec b/aspell.spec index 8962d8fc9e5e4793936f607f93d699d2df9ab184..053e6b0e98ffa3c4fa471b44ed2724618811e6b0 100644 --- a/aspell.spec +++ b/aspell.spec @@ -1,55 +1,37 @@ -Name: aspell -Version: 0.60.6.1 -Release: 29 -Summary: Spell checker -Epoch: 12 -License: LGPLv2+ and LGPLv2 and GPLv2+ and BSD -URL: http://aspell.net/ -Source: http://mirrors.ustc.edu.cn/gnu/aspell/aspell-%{version}.tar.gz - -Patch0000: aspell-0.60.3-install_info.patch -Patch0001: aspell-0.60.5-fileconflict.patch -Patch0002: aspell-0.60.5-pspell_conf.patch -Patch0003: aspell-0.60.6-zero.patch -Patch0004: aspell-0.60.6-mp.patch -Patch0005: aspell-0.60.6.1-dump-personal-abort.patch -Patch0006: aspell-0.60.6.1-aarch64.patch -Patch0007: aspell-0.60.6.1-gcc7-fixes.patch -Patch0008: aspell-0.60.6.1-fix-back-on-empty-vector.patch -Patch0009: CVE-2019-17544.patch -Patch0010: CVE-2019-20433-1.patch -Patch0011: CVE-2019-20433-2.patch -Patch0012: aspell-0.60.6.1-sw.patch - -BuildRequires: chrpath gettext ncurses-devel pkgconfig perl-interpreter gcc-c++ - +Summary: Spell checker +Name: aspell +Version: 0.60.8 +Release: 1 +Epoch: 12 +License: LGPLv2+ and LGPLv2 and GPLv2+ and BSD +URL: http://aspell.net/ +Source: ftp://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz +BuildRequires: gcc-c++ make chrpath gettext ncurses-devel pkgconfig perl-interpreter +Patch0: aspell-0.60.7-fileconflict.patch +Patch1: aspell-0.60.7-pspell_conf.patch +Patch2: aspell-0.60.7-mp.patch %description -GNU Aspell is a spell checker intended to replace Ispell. -It can be used as a library and spell checker. Its main -feature is that it provides much better suggestions than -other inspectors, including Ispell and Microsoft Word. -It also has many other technical enhancements to Ispell, -such as the use of shared memory to store dictionaries, -and intelligent processing of personal dictionaries when -multiple Aspell processes are opened at one time. +GNU Aspell is a spell checker designed to eventually replace Ispell. It can +either be used as a library or as an independent spell checker. Its main +feature is that it does a much better job of coming up with possible +suggestions than just about any other spell checker out there for the +English language, including Ispell and Microsoft Word. It also has many +other technical enhancements over Ispell such as using shared memory for +dictionaries and intelligently handling personal dictionaries when more +than one Aspell process is open at once. %package devel -Summary: Libraries and header files for Aspell development -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: pkgconfig - +Summary: Libraries and header files for Aspell development +Requires: %{name} = %{epoch}:%{version}-%{release} pkgconfig %description devel The aspell-devel package includes libraries and header files needed for Aspell development. -%package help -Summary: Introduce how to use aspell - -%description help -User's Manual for aspell - %prep -%autosetup -n %{name}-%{version} -p1 +%setup -q +%patch0 -p1 -b .fc +%patch1 -p1 -b .mlib +%patch2 -p1 -b .ai iconv -f iso-8859-2 -t utf-8 < manual/aspell.info > manual/aspell.info.aux mv manual/aspell.info.aux manual/aspell.info @@ -62,25 +44,29 @@ chmod 644 examples/aspell-import cp manual/aspell-import.1 examples/aspell-import.1 %install -%makeinstall - -install -d ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60 - -mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/{ispell,spell} ${RPM_BUILD_ROOT}%{_bindir} - -for path in nroff-filter.so sgml-filter.so context-filter.so email-filter.so tex-filter.so texinfo-filter.so; -do - chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//$path; -done +%make_install +mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60 +mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/ispell ${RPM_BUILD_ROOT}%{_bindir} +mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/spell ${RPM_BUILD_ROOT}%{_bindir} +chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//nroff-filter.so +chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//sgml-filter.so +chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//context-filter.so +chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//email-filter.so +chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//tex-filter.so +chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//texinfo-filter.so +chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//markdown-filter.so chrpath --delete ${RPM_BUILD_ROOT}%{_bindir}/aspell chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/libpspell.so.* - -rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man1/aspell-import.1 - +rm -f ${RPM_BUILD_ROOT}%{_libdir}/libaspell.la +rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpspell.la +rm -f ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/*-filter.la +rm -f ${RPM_BUILD_ROOT}%{_bindir}/aspell-import +rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/aspell-import.1 +rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %find_lang %{name} %files -f %{name}.lang -%doc COPYING examples/aspell-import examples/aspell-import.1 +%doc README TODO COPYING examples/aspell-import examples/aspell-import.1 %dir %{_libdir}/aspell-0.60 %{_bindir}/a* %{_bindir}/ispell @@ -91,10 +77,10 @@ rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man1/aspell-import.1 %{_libdir}/lib*.so.* %{_libdir}/aspell-0.60/* %{_infodir}/aspell.* -%exclude %{_libdir}/libaspell.la -%exclude %{_libdir}/libpspell.la -%exclude %{_libdir}/aspell-0.60/*-filter.la -%exclude %{_bindir}/aspell-import +%{_mandir}/man1/aspell.1.* +%{_mandir}/man1/run-with-aspell.1* +%{_mandir}/man1/word-list-compress.1* +%{_mandir}/man1/prezip-bin.1.* %files devel %dir %{_includedir}/pspell @@ -104,27 +90,6 @@ rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man1/aspell-import.1 %{_libdir}/lib*spell.so %{_libdir}/pkgconfig/* %{_infodir}/aspell-dev.* - -%files help -%doc README TODO -%{_mandir}/man1/aspell.1.* -%{_mandir}/man1/run-with-aspell.1* -%{_mandir}/man1/word-list-compress.1* -%{_mandir}/man1/prezip-bin.1.* %{_mandir}/man1/pspell-config.1* %changelog -* Thu Jul 28 2022 wuzx - 12:0.60.6.1-29 -- add sw64 patch - -* Wed Sep 29 2021 yaoxin - 12:0.60.6.1-28 -- fix CVE-2019-20433 - -* Thu Jul 27 2021 houyingchao - 12:0.60.6.1-27 -- fix CVE-2019-17544 - -* Thu Dec 24 2020 Ge Wang - 12:0.60.6.1-26 -- Modify Source0 url - -* Wed Nov 27 2019 yangjian - 12:0.60.6.1-25 -- Package init