From 77874ac1671d08981881243d04821874c814e48f Mon Sep 17 00:00:00 2001 From: wxiat Date: Wed, 2 Aug 2023 16:56:52 +0800 Subject: [PATCH] cherry pick `add sw arch #16b9c757acbd1228ae5d3ff7724aface1f8f8bdc` Signed-off-by: Weisson --- aspell-0.60.8-sw.patch | 12 ++++++++++++ aspell.spec | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 aspell-0.60.8-sw.patch diff --git a/aspell-0.60.8-sw.patch b/aspell-0.60.8-sw.patch new file mode 100644 index 0000000..3dcfb62 --- /dev/null +++ b/aspell-0.60.8-sw.patch @@ -0,0 +1,12 @@ +diff -Nuar aspell-0.60.8.org/m4/intdiv0.m4 aspell-0.60.8.sw/m4/intdiv0.m4 +--- aspell-0.60.8.org/m4/intdiv0.m4 2023-08-02 16:49:25.118694744 +0800 ++++ aspell-0.60.8.sw/m4/intdiv0.m4 2023-08-02 16:51:23.890884240 +0800 +@@ -69,7 +69,7 @@ + # Guess based on the CPU. + changequote(,)dnl + case "$host_cpu" in +- alpha* | i[34567]86 | x86_64 | m68k | s390*) ++ sw_64* | alpha* | i[34567]86 | x86_64 | m68k | s390*) + gt_cv_int_divbyzero_sigfpe="guessing yes";; + *) + gt_cv_int_divbyzero_sigfpe="guessing no";; diff --git a/aspell.spec b/aspell.spec index 27272e8..eae32ff 100644 --- a/aspell.spec +++ b/aspell.spec @@ -1,7 +1,8 @@ +%define anolis_release .0.1 Summary: Spell checker Name: aspell Version: 0.60.8 -Release: 8%{?dist} +Release: 8%{anolis_release}%{?dist} Epoch: 12 # LGPLv2+ .. common/gettext.h # LGPLv2 .. modules/speller/default/phonet.hpp, @@ -16,6 +17,7 @@ Source: ftp://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz Patch0: aspell-0.60.7-fileconflict.patch Patch1: aspell-0.60.7-pspell_conf.patch Patch2: aspell-0.60.7-mp.patch +Patch3: aspell-0.60.8-sw.patch BuildRequires: gcc-c++ BuildRequires: chrpath, gettext, ncurses-devel, pkgconfig, perl-interpreter @@ -45,6 +47,9 @@ and header files needed for Aspell development. %patch0 -p1 -b .fc %patch1 -p1 -b .mlib %patch2 -p1 -b .ai +%ifarch sw_64 +%patch3 -p1 +%endif iconv -f iso-8859-2 -t utf-8 < manual/aspell.info > manual/aspell.info.aux mv manual/aspell.info.aux manual/aspell.info @@ -111,6 +116,9 @@ rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %{_mandir}/man1/pspell-config.1* %changelog +* Tue Mar 19 2024 wxiat - 12:0.60.8-8.0.1 +- cherry pick `add sw arch #16b9c757acbd1228ae5d3ff7724aface1f8f8bdc`. + * Mon Aug 09 2021 Mohan Boddu - 12:0.60.8-8 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 -- Gitee