From aa1070ac2daa617080c9eb1badcedef3a6abac56 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 30 2019 04:24:51 +0000 Subject: import aspell-0.60.6.1-21.el8 --- diff --git a/.aspell.metadata b/.aspell.metadata new file mode 100644 index 0000000..bfc06b7 --- /dev/null +++ b/.aspell.metadata @@ -0,0 +1 @@ +ff1190db8de279f950c242c6f4c5d5cdc2cbdc49 SOURCES/aspell-0.60.6.1.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1bb69ca --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/aspell-0.60.6.1.tar.gz diff --git a/SOURCES/aspell-0.60.3-install_info.patch b/SOURCES/aspell-0.60.3-install_info.patch new file mode 100644 index 0000000..34e5636 --- /dev/null +++ b/SOURCES/aspell-0.60.3-install_info.patch @@ -0,0 +1,30 @@ +diff -up aspell-0.60.6.1/manual/Makefile.in.iinfo aspell-0.60.6.1/manual/Makefile.in +--- aspell-0.60.6.1/manual/Makefile.in.iinfo 2011-07-04 10:58:49.000000000 +0200 ++++ aspell-0.60.6.1/manual/Makefile.in 2011-08-15 16:29:40.999718535 +0200 +@@ -607,16 +607,16 @@ install-info-am: $(INFO_DEPS) + else : ; fi; \ + done; \ + done +- @$(POST_INSTALL) +- @if (install-info --version && \ +- install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ +- list='$(INFO_DEPS)'; \ +- for file in $$list; do \ +- relfile=`echo "$$file" | sed 's|^.*/||'`; \ +- echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\ +- install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ +- done; \ +- else : ; fi ++# @$(POST_INSTALL) ++# @if (install-info --version && \ ++# install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ ++# list='$(INFO_DEPS)'; \ ++# for file in $$list; do \ ++# relfile=`echo "$$file" | sed 's|^.*/||'`; \ ++# echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\ ++# install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ ++# done; \ ++# else : ; fi + install-man: install-man1 + + install-pdf: install-pdf-am diff --git a/SOURCES/aspell-0.60.5-fileconflict.patch b/SOURCES/aspell-0.60.5-fileconflict.patch new file mode 100644 index 0000000..08f1fbd --- /dev/null +++ b/SOURCES/aspell-0.60.5-fileconflict.patch @@ -0,0 +1,70 @@ +diff -up aspell-0.60.6.1/configure.fc aspell-0.60.6.1/configure +--- aspell-0.60.6.1/configure.fc 2011-07-04 10:58:50.000000000 +0200 ++++ aspell-0.60.6.1/configure 2011-08-16 11:28:58.626771599 +0200 +@@ -839,6 +839,7 @@ MAINTAINER_MODE_FALSE + MAINT + pkgdocdir + pkgdatadir ++pkgdatadir2 + pkglibdir + CXX + CXXFLAGS +@@ -2634,18 +2635,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 + + +@@ -20119,6 +20123,7 @@ MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_F + MAINT!$MAINT$ac_delim + pkgdocdir!$pkgdocdir$ac_delim + pkgdatadir!$pkgdatadir$ac_delim ++pkgdatadir2!$pkgdatadir2$ac_delim + pkglibdir!$pkglibdir$ac_delim + CXX!$CXX$ac_delim + CXXFLAGS!$CXXFLAGS$ac_delim +@@ -20142,7 +20147,7 @@ ac_ct_CC!$ac_ct_CC$ac_delim + CCDEPMODE!$CCDEPMODE$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +diff -up aspell-0.60.6.1/Makefile.in.fc aspell-0.60.6.1/Makefile.in +--- aspell-0.60.6.1/Makefile.in.fc 2011-07-04 10:58:49.000000000 +0200 ++++ aspell-0.60.6.1/Makefile.in 2011-08-16 11:20:09.030887258 +0200 +@@ -344,6 +344,7 @@ distcleancheck_listfiles = find . -type + + # These are needed due to a bug in Automake + pkgdatadir = @pkgdatadir@ ++pkgdatadir2 = @pkgdatadir2@ + pkglibdir = @pkglibdir@ + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ +@@ -1932,7 +1933,7 @@ gen/dirs.h: gen/mk-dirs_h.pl + cd gen; perl mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir} ${sysconfdir} > 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/SOURCES/aspell-0.60.5-pspell_conf.patch b/SOURCES/aspell-0.60.5-pspell_conf.patch new file mode 100644 index 0000000..9236ab4 --- /dev/null +++ b/SOURCES/aspell-0.60.5-pspell_conf.patch @@ -0,0 +1,60 @@ +diff -up aspell-0.60.6.1/configure.mlib aspell-0.60.6.1/configure +--- aspell-0.60.6.1/configure.mlib 2011-08-16 11:40:48.000000000 +0200 ++++ aspell-0.60.6.1/configure 2011-08-16 11:41:44.013663519 +0200 +@@ -18989,7 +18989,7 @@ rm -f core conftest.err conftest.$ac_obj + # # + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # + +-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 +@@ -19985,7 +19985,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" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; +diff -up aspell-0.60.6.1/Makefile.in.mlib aspell-0.60.6.1/Makefile.in +--- aspell-0.60.6.1/Makefile.in.mlib 2011-08-16 11:20:09.000000000 +0200 ++++ aspell-0.60.6.1/Makefile.in 2011-08-16 11:46:30.643236786 +0200 +@@ -816,6 +816,8 @@ clean-filterLTLIBRARIES: + done + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) ++ mkdir -p $(libdir)/pkgconfig; \ ++ cp aspell.pc $(libdir)/pkgconfig/aspell.pc; \ + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +diff -up aspell-0.60.6.1/scripts/mkconfig.mlib aspell-0.60.6.1/scripts/mkconfig +--- aspell-0.60.6.1/scripts/mkconfig.mlib 2004-01-03 13:06:24.000000000 +0100 ++++ aspell-0.60.6.1/scripts/mkconfig 2011-08-16 11:42:46.810519200 +0200 +@@ -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" +--- /dev/null 2007-01-02 09:09:01.616000852 +0100 ++++ aspell-0.60.6.1/aspell.pc.in 2007-01-02 14:59:04.000000000 +0100 +@@ -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/SOURCES/aspell-0.60.6-mp.patch b/SOURCES/aspell-0.60.6-mp.patch new file mode 100644 index 0000000..d7ef3d2 --- /dev/null +++ b/SOURCES/aspell-0.60.6-mp.patch @@ -0,0 +1,44 @@ +diff -up aspell-0.60.6/manual/aspell.1.pom aspell-0.60.6/manual/aspell.1 +--- aspell-0.60.6/manual/aspell.1.pom 2006-12-19 11:55:08.000000000 +0100 ++++ aspell-0.60.6/manual/aspell.1 2010-08-17 09:42:14.000000000 +0200 +@@ -328,7 +328,6 @@ are also allowed. The \fI/etc/aspell.co + 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 -up aspell-0.60.6/manual/prezip-bin.1.pom aspell-0.60.6/manual/prezip-bin.1 +--- aspell-0.60.6/manual/prezip-bin.1.pom 2005-10-21 14:18:23.000000000 +0200 ++++ aspell-0.60.6/manual/prezip-bin.1 2010-08-17 09:42:21.000000000 +0200 +@@ -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 -up aspell-0.60.6/manual/run-with-aspell.1.pom aspell-0.60.6/manual/run-with-aspell.1 +--- aspell-0.60.6/manual/run-with-aspell.1.pom 2004-03-05 05:05:02.000000000 +0100 ++++ aspell-0.60.6/manual/run-with-aspell.1 2010-08-17 09:42:28.000000000 +0200 +@@ -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 -up aspell-0.60.6/manual/word-list-compress.1.pom aspell-0.60.6/manual/word-list-compress.1 +--- aspell-0.60.6/manual/word-list-compress.1.pom 2005-10-21 14:18:23.000000000 +0200 ++++ aspell-0.60.6/manual/word-list-compress.1 2010-08-17 09:42:35.000000000 +0200 +@@ -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/SOURCES/aspell-0.60.6-zero.patch b/SOURCES/aspell-0.60.6-zero.patch new file mode 100644 index 0000000..11f476d --- /dev/null +++ b/SOURCES/aspell-0.60.6-zero.patch @@ -0,0 +1,11 @@ +diff -up aspell-0.60.6/common/convert.cpp.zero aspell-0.60.6/common/convert.cpp +--- aspell-0.60.6/common/convert.cpp.zero 2007-12-03 07:55:45.000000000 +0100 ++++ aspell-0.60.6/common/convert.cpp 2008-09-01 12:04:39.000000000 +0200 +@@ -813,6 +813,7 @@ namespace acommon { + { + ToUniLookup lookup; + void decode(const char * in, int size, FilterCharVector & out) const { ++ if (size == 0) return; // if size == 0 then while loop cause SIGSEGV + const char * stop = in + size; // this is OK even if size == -1 + while (*in && in != stop) { + out.append(from_utf8(in, stop)); diff --git a/SOURCES/aspell-0.60.6.1-aarch64.patch b/SOURCES/aspell-0.60.6.1-aarch64.patch new file mode 100644 index 0000000..6745e7d --- /dev/null +++ b/SOURCES/aspell-0.60.6.1-aarch64.patch @@ -0,0 +1,1144 @@ +diff -urN aspell-0.60.6.1/config.guess aspell-0.60.6.1-aarch64/config.guess +--- aspell-0.60.6.1/config.guess 2011-07-02 16:53:17.000000000 -0500 ++++ aspell-0.60.6.1-aarch64/config.guess 2013-03-07 19:06:06.613457060 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2009-11-20' ++timestamp='2012-09-25' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,9 +17,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -56,8 +54,9 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -144,7 +143,7 @@ + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -180,7 +179,7 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +@@ -201,6 +200,10 @@ + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} +@@ -223,7 +226,7 @@ + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on +@@ -269,7 +272,10 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead +@@ -295,12 +301,12 @@ + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -394,23 +400,23 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; +@@ -480,8 +486,8 @@ + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -494,7 +500,7 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; +@@ -551,7 +557,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -594,52 +600,52 @@ + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include ++ #include + +- #define _HPUX_SOURCE +- #include +- #include +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -730,22 +736,22 @@ + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; +@@ -769,14 +775,14 @@ + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +@@ -788,30 +794,35 @@ + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- case ${UNAME_MACHINE} in +- pc98) +- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) +- # uname -m includes "-pc" on this system. +- echo ${UNAME_MACHINE}-mingw32 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:*) +- case ${UNAME_MACHINE} in ++ case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +@@ -857,6 +868,13 @@ + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +@@ -866,7 +884,7 @@ + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; +- esac ++ esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +@@ -878,20 +896,29 @@ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + LIBC=gnu +@@ -933,7 +960,7 @@ + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu +@@ -959,7 +986,7 @@ + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -967,14 +994,17 @@ + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. +@@ -983,11 +1013,11 @@ + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) +@@ -1019,7 +1049,7 @@ + fi + exit ;; + i*86:*:5:[678]*) +- # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; +@@ -1047,13 +1077,13 @@ + exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i586. ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp +- exit ;; ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; +@@ -1088,8 +1118,8 @@ + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ +@@ -1132,10 +1162,10 @@ + echo ns32k-sni-sysv + fi + exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm +@@ -1161,11 +1191,11 @@ + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; +@@ -1178,6 +1208,9 @@ + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1230,7 +1263,10 @@ + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) +@@ -1275,13 +1311,13 @@ + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) +- UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; +@@ -1299,11 +1335,11 @@ + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c < + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + +diff -urN aspell-0.60.6.1/config.sub aspell-0.60.6.1-aarch64/config.sub +--- aspell-0.60.6.1/config.sub 2011-07-02 16:53:17.000000000 -0500 ++++ aspell-0.60.6.1-aarch64/config.sub 2013-03-07 19:06:06.651452728 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2009-11-20' ++timestamp='2012-10-10' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,9 +21,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -75,8 +73,9 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -123,13 +122,18 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ +- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -152,12 +156,12 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray | -microblaze) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; +- -bluegene*) +- os=-cnk ++ -bluegene*) ++ os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= +@@ -173,10 +177,10 @@ + os=-chorusos + basic_machine=$1 + ;; +- -chorusrdb) +- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 +- ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; +@@ -221,6 +225,12 @@ + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -245,20 +255,25 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | be32 | be64 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ +- | maxq | mb | microblaze | mcore | mep | metag \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +@@ -281,29 +296,39 @@ + | moxie \ + | mt \ + | msp430 \ ++ | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ ++ | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ +- | rx \ ++ | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +- | spu | strongarm \ +- | tahoe | thumb | tic4x | tic80 | tron \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ +- | v850 | v850e \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ +- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12 | picochip) +- # Motorola 68HC11/12. ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; +@@ -313,6 +338,21 @@ + basic_machine=mt-unknown + ;; + ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; ++ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. +@@ -327,25 +367,30 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ ++ | be32-* | be64-* \ + | bfin-* | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +@@ -367,25 +412,29 @@ + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* | rx-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ +- | tahoe-* | thumb-* \ +- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile*-* \ + | tron-* \ + | ubicom32-* \ +- | v850-* | v850e-* | vax-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) +@@ -410,7 +459,7 @@ + basic_machine=a29k-amd + os=-udi + ;; +- abacus) ++ abacus) + basic_machine=abacus-unknown + ;; + adobe68k) +@@ -480,11 +529,20 @@ + basic_machine=powerpc-ibm + os=-cnk + ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; +- cegcc) ++ cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; +@@ -516,7 +574,7 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16) ++ cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; +@@ -674,7 +732,6 @@ + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -732,9 +789,13 @@ + basic_machine=ns32k-utek + os=-sysv + ;; +- microblaze) ++ microblaze*) + basic_machine=microblaze-xilinx + ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -771,10 +832,18 @@ + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; ++ msys) ++ basic_machine=i386-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ++ nacl) ++ basic_machine=le32-unknown ++ os=-nacl ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 +@@ -839,6 +908,12 @@ + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -921,9 +996,10 @@ + ;; + power) basic_machine=power-ibm + ;; +- ppc) basic_machine=powerpc-unknown ++ ppc | ppcbe) basic_machine=powerpc-unknown + ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +@@ -1017,6 +1093,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -1073,20 +1152,8 @@ + basic_machine=t90-cray + os=-unicos + ;; +- tic54x | c54x*) +- basic_machine=tic54x-unknown +- os=-coff +- ;; +- tic55x | c55x*) +- basic_machine=tic55x-unknown +- os=-coff +- ;; +- tic6x | c6x*) +- basic_machine=tic6x-unknown +- os=-coff +- ;; + tile*) +- basic_machine=tile-unknown ++ basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) +@@ -1156,6 +1223,9 @@ + xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; + ymp) + basic_machine=ymp-cray + os=-unicos +@@ -1253,11 +1323,11 @@ + if [ x"$os" != x"" ] + then + case $os in +- # First match some system type aliases +- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. +- -auroraux) +- os=-auroraux ++ -auroraux) ++ os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` +@@ -1287,14 +1357,15 @@ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +- | -openbsd* | -solidbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +@@ -1341,7 +1412,7 @@ + -opened*) + os=-openedition + ;; +- -os400*) ++ -os400*) + os=-os400 + ;; + -wince*) +@@ -1390,7 +1461,7 @@ + -sinix*) + os=-sysv4 + ;; +- -tpf*) ++ -tpf*) + os=-tpf + ;; + -triton*) +@@ -1435,6 +1506,8 @@ + -dicos*) + os=-dicos + ;; ++ -nacl*) ++ ;; + -none) + ;; + *) +@@ -1457,10 +1530,10 @@ + # system, and we'll never get to this point. + + case $basic_machine in +- score-*) ++ score-*) + os=-elf + ;; +- spu-*) ++ spu-*) + os=-elf + ;; + *-acorn) +@@ -1472,8 +1545,20 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ hexagon-*) ++ os=-elf ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) +@@ -1493,14 +1578,11 @@ + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; +- mep-*) ++ mep-*) + os=-elf + ;; + mips*-cisco) +@@ -1527,7 +1609,7 @@ + *-ibm) + os=-aix + ;; +- *-knuth) ++ *-knuth) + os=-mmixware + ;; + *-wec) diff --git a/SOURCES/aspell-0.60.6.1-dump-personal-abort.patch b/SOURCES/aspell-0.60.6.1-dump-personal-abort.patch new file mode 100644 index 0000000..6aa982f --- /dev/null +++ b/SOURCES/aspell-0.60.6.1-dump-personal-abort.patch @@ -0,0 +1,13 @@ +diff -upr aspell-0.60.6.1.orig/prog/aspell.cpp aspell-0.60.6.1/prog/aspell.cpp +--- aspell-0.60.6.1.orig/prog/aspell.cpp 2011-07-04 11:13:58.000000000 +0200 ++++ aspell-0.60.6.1/prog/aspell.cpp 2012-07-19 15:16:43.204799622 +0200 +@@ -1570,7 +1570,8 @@ void personal () { + + Config * config = options; + Dictionary * per = new_default_writable_dict(); +- per->load(config->retrieve("personal-path"), *config); ++ PosibErr pe = per->load(config->retrieve("personal-path"), *config); ++ if (pe.has_err()) {print_error(pe.get_err()->mesg); exit(1);} + StackPtr els(per->detailed_elements()); + StackPtr conv(setup_conv(per->lang(), config)); + diff --git a/SOURCES/aspell-0.60.6.1-fix-back-on-empty-vector.patch b/SOURCES/aspell-0.60.6.1-fix-back-on-empty-vector.patch new file mode 100644 index 0000000..f41db9b --- /dev/null +++ b/SOURCES/aspell-0.60.6.1-fix-back-on-empty-vector.patch @@ -0,0 +1,38 @@ +From c6755a399e8a31cbee5129dde5124f9c54a47ab6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nikola=20Forr=C3=B3?= +Date: Wed, 4 Apr 2018 14:58:03 +0200 +Subject: [PATCH] Do not call back() on an empty vector +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Calling std::vector::back() on an empty container is undefined. +Avoid doing that, simply return pointer to the beginning in case +the vector is empty. + +Signed-off-by: Nikola Forró +--- + common/vector.hpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/common/vector.hpp b/common/vector.hpp +index 782e4b0..cb344bd 100644 +--- a/common/vector.hpp ++++ b/common/vector.hpp +@@ -36,13 +36,13 @@ namespace acommon + } + T * data() {return &*this->begin();} + T * data(int pos) {return &*this->begin() + pos;} +- T * data_end() {return &this->back()+1;} ++ T * data_end() {return this->empty() ? &*this->begin() : &this->back()+1;} + + T * pbegin() {return &*this->begin();} +- T * pend() {return &this->back()+1;} ++ T * pend() {return this->empty() ? &*this->begin() : &this->back()+1;} + + const T * pbegin() const {return &*this->begin();} +- const T * pend() const {return &this->back()+1;} ++ const T * pend() const {return this->empty() ? &*this->begin() : &this->back()+1;} + + template + U * datap() { diff --git a/SOURCES/aspell-0.60.6.1-gcc7-fixes.patch b/SOURCES/aspell-0.60.6.1-gcc7-fixes.patch new file mode 100644 index 0000000..4eb825a --- /dev/null +++ b/SOURCES/aspell-0.60.6.1-gcc7-fixes.patch @@ -0,0 +1,34 @@ +commit 8089fa02122fed0a6394eba14bbedcb1d18e2384 +Author: Kevin Atkinson +Date: Thu Dec 29 00:50:31 2016 -0500 + + Compile Fixes for GCC 7. + + Closes #519. + +diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp +index a979539..19ab63c 100644 +--- a/modules/filter/tex.cpp ++++ b/modules/filter/tex.cpp +@@ -174,7 +174,7 @@ namespace { + + if (c == '{') { + +- if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0') ++ if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0') + push_command(Parm); + + top.in_what = Parm; +diff --git a/prog/check_funs.cpp b/prog/check_funs.cpp +index db54f3d..89ee09d 100644 +--- a/prog/check_funs.cpp ++++ b/prog/check_funs.cpp +@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * word, int width) { + } + } + if (i == width-1) { +- if (word == '\0') ++ if (*word == '\0') + put(out,' '); + else if (word[len] == '\0') + put(out, word, len); diff --git a/SPECS/aspell.spec b/SPECS/aspell.spec new file mode 100644 index 0000000..207518f --- /dev/null +++ b/SPECS/aspell.spec @@ -0,0 +1,597 @@ +Summary: Spell checker +Name: aspell +Version: 0.60.6.1 +Release: 21%{?dist} +Epoch: 12 +# LGPLv2+ .. common/gettext.h +# LGPLv2 .. modules/speller/default/phonet.hpp, +# modules/speller/default/phonet.cpp, +# modules/speller/default/affix.cpp +# GPLv2+ .. ltmain.sh, misc/po-filter.c +# BSD .. myspell/munch.c +License: LGPLv2+ and LGPLv2 and GPLv2+ and BSD +Group: Applications/Text +URL: http://aspell.net/ +Source: ftp://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz + +Patch0: aspell-0.60.3-install_info.patch +Patch1: aspell-0.60.5-fileconflict.patch +Patch2: aspell-0.60.5-pspell_conf.patch +# resolves: #447428 +Patch3: aspell-0.60.6-zero.patch +Patch4: aspell-0.60.6-mp.patch +# resolves: #813261 +Patch5: aspell-0.60.6.1-dump-personal-abort.patch +# resolves: #925034 +Patch6: aspell-0.60.6.1-aarch64.patch +# resolves: #1423239 +Patch7: aspell-0.60.6.1-gcc7-fixes.patch +# resolves: #1562364 +Patch8: aspell-0.60.6.1-fix-back-on-empty-vector.patch + +BuildRequires: gcc-c++ +BuildRequires: chrpath, gettext, ncurses-devel, pkgconfig, perl-interpreter +Requires(pre): /sbin/install-info +Requires(preun): /sbin/install-info + +%description +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 +Group: Development/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: pkgconfig +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info + +%description devel +The aspell-devel package includes libraries +and header files needed for Aspell development. + +%prep +%setup -q +%patch0 -p1 -b .iinfo +%patch1 -p1 -b .fc +%patch2 -p1 -b .mlib +%patch3 -p1 -b .zero +%patch4 -p1 -b .ai +%patch5 -p1 -b .dump-personal +%patch6 -p1 -b .aarch64 +%patch7 -p1 -b .gcc7-fixes +%patch8 -p1 -b .back-empty-vector +iconv -f iso-8859-2 -t utf-8 < manual/aspell.info > manual/aspell.info.aux +mv manual/aspell.info.aux manual/aspell.info + +%build +%configure --disable-rpath +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +make %{?_smp_mflags} +cp scripts/aspell-import examples/aspell-import +chmod 644 examples/aspell-import +cp manual/aspell-import.1 examples/aspell-import.1 + +%install +# make install DESTDIR=$RPM_BUILD_ROOT doesn't work +%makeinstall + +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}%{_bindir}/aspell +chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/libpspell.so.* + +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 + +%find_lang %{name} + +%post +/sbin/ldconfig +if [ -f %{_infodir}/aspell.info.gz ]; then + /sbin/install-info %{_infodir}/aspell.info.gz %{_infodir}/dir --entry="* Aspell: (aspell). " || : +fi + +%post devel +if [ -f %{_infodir}/aspell-dev.info.gz ]; then + /sbin/install-info %{_infodir}/aspell-dev.info.gz %{_infodir}/dir --entry="* Aspell-dev: (aspell-dev). " || : +fi + +%preun +if [ $1 = 0 ]; then + if [ -f %{_infodir}/aspell.info.gz ]; then + /sbin/install-info --delete %{_infodir}/aspell.info.gz %{_infodir}/dir || : + fi +fi + +%preun devel +if [ $1 = 0 ]; then + if [ -f %{_infodir}/aspell-dev.info.gz ]; then + /sbin/install-info --delete %{_infodir}/aspell-dev.info.gz %{_infodir}/dir || : + fi +fi + +%postun -p /sbin/ldconfig + +%files -f %{name}.lang +%doc README TODO COPYING examples/aspell-import examples/aspell-import.1 +%dir %{_libdir}/aspell-0.60 +%{_bindir}/a* +%{_bindir}/ispell +%{_bindir}/pr* +%{_bindir}/run-with-aspell +%{_bindir}/spell +%{_bindir}/word-list-compress +%{_libdir}/lib*.so.* +%{_libdir}/aspell-0.60/* +%{_infodir}/aspell.* +%{_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 +%{_bindir}/pspell-config +%{_includedir}/aspell.h +%{_includedir}/pspell/pspell.h +%{_libdir}/lib*spell.so +%{_libdir}/pkgconfig/* +%{_infodir}/aspell-dev.* +%{_mandir}/man1/pspell-config.1* + +%changelog +* Wed Apr 04 2018 Nikola Forró - 12:0.60.6.1-21 +- resolves: #1562364 + do not call back() on an empty vector + +* Tue Feb 20 2018 Nikola Forró - 12:0.60.6.1-20 +- add missing gcc-c++ build dependency + +* Wed Feb 07 2018 Fedora Release Engineering - 12:0.60.6.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 12:0.60.6.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 12:0.60.6.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Feb 23 2017 Nikola Forró - 12:0.60.6.1-16 +- resolves: #1423239 + fix building with GCC 7 + +* Fri Feb 10 2017 Fedora Release Engineering - 12:0.60.6.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Dec 06 2016 Nikola Forró - 12:0.60.6.1-14 +- resolves: #1401713 + add perl to BuildRequires + +* Wed Feb 03 2016 Fedora Release Engineering - 12:0.60.6.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 12:0.60.6.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 12:0.60.6.1-11 +- Rebuilt for GCC 5 C++11 ABI change + +* Fri Aug 15 2014 Fedora Release Engineering - 12:0.60.6.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 12:0.60.6.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 12:0.60.6.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Mar 25 2013 Peter Schiffer - 12:0.60.6.1-7 +- resolves: #925034 + add support for aarch64 + +* Wed Feb 13 2013 Fedora Release Engineering - 12:0.60.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Aug 27 2012 Peter Schiffer - 12:0.60.6.1-5 +- done some minor .spec file cleanup + +* Thu Jul 19 2012 Peter Schiffer - 12:0.60.6.1-4 +- resolves: #813261 + fixed crash when trying to run "aspell dump personal" + +* Wed Jul 18 2012 Fedora Release Engineering - 12:0.60.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 12:0.60.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Aug 16 2011 Peter Schiffer - 12:0.60.6.1-1 +- resolves: #718946 + update to 0.60.6.1 + +* Mon May 2 2011 Ivana Hutarova Varekova - 12.0.60.6-15 +- fix minor problems in spec file + +* Mon Feb 07 2011 Fedora Release Engineering - 12:0.60.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Aug 17 2010 Ivana Hutarova Varekova - 12.0.60.6-13 +- remove obsolete links from man-pages + +* Tue Mar 2 2010 Ivana Hutarova Varekova - 12.0.60.6-12 +- fix -devel scriptlets + +* Tue Dec 15 2009 Ivana Hutarova Varekova - 12:0.60.6-11 +- remove obsolete patch + +* Fri Dec 4 2009 Ivana Hutarova Varekova - 12:0.60.6-10 +- fix rpath problem (chrpath) + +* Tue Dec 1 2009 Ivana Hutarova Varekova - 12:0.60.6-9 +- add --disable-rpath to configure part + remove remanent obsolete tags + fix license field + +* Fri Nov 27 2009 Ivana Hutarova Varekova - 12:0.60.6-8 +- change summary name + remove outdated Obsoletes, Conflicts and Provides flag + fix requirement to install-info (pre -> post) + move aspell-import to documentation part + remove exit 0 from scriptlets + +* Mon Aug 10 2009 Ivana Varekova - 12:0.60.6-7 +- fix installation with --excludedocs option (#515911) + +* Fri Jul 24 2009 Fedora Release Engineering - 12:0.60.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 12:0.60.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Feb 12 2009 Ivana Varekova - 12:0.60.6-4 +- remove aspell-en require + +* Mon Sep 1 2008 Ivana Varekova - 12:0.60.6-3 +- fix patch format + +* Thu May 29 2008 Ivana Varekova - 12:0.60.6-2 +- Resolves: #447428 + aspell sigserv on checking file with 0 length + +* Wed May 7 2008 Ivana Varekova - 12:0.60.6-1 +- update to 0.60.6 + +* Wed Feb 20 2008 Fedora Release Engineering - 12:0.60.5-5 +- Autorebuild for GCC 4.3 + +* Tue Jan 22 2008 Ivana Varekova - 12:0.60.5-4 +- add gcc43 patch + +* Thu Feb 8 2007 Ivana Varekova - 12:0.60.5-3 +- incorporate package review feedback + +* Mon Jan 22 2007 Ivana Varekova - 12:0.60.5-2 +- Resolves: 223676 + fix non-failsafe install-info problem + +* Tue Jan 2 2007 Ivana Varekova - 12:0.60.5-1 +- update to 0.60.4 +- cleanup spec file + +* Wed Nov 8 2006 Ivana Varekova - 12:0.60.4-1 +- update to 0.60.4 + +* Wed Jul 12 2006 Jesse Keating - 12:0.60.3-7.1 +- rebuild + +* Tue May 23 2006 Ivana Varekova - 12:0.60.3-7 +- fix multilib problem (used pkgconfig) + +* Wed Mar 22 2006 Ivana Varekova - 12:0.60.3-6 +- remove .la files (bug 184184) + +* Thu Mar 2 2006 Ivana Varekova - 12:0.60.3-5 +- update aspell man page (bug 183205) + +* Tue Feb 21 2006 Ivana Varekova - 12:0.60.3-4 +- fix multilib file conflict + +* Fri Feb 10 2006 Jesse Keating - 12:0.60.3-3.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 12:0.60.3-3.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Mon Dec 19 2005 Ivana Varekova 12:0.60.3-3 +- fix for gcc 4.1 + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Fri Jul 15 2005 Ivana Varekova 12:0.60.3-2 +- fix install-info problem + +* Wed Jul 13 2005 Ivana Varekova 12:0.60.3-1 +- update to 0.60.3 - (bug 141968) thanks to Dawid Gajownik +- add BuildRequires: ncurses-devel, gettext +- add config script patch (thanks tmraz@redhat.com) + + +* Mon Mar 7 2005 Ivana Varekova 12:0.50.5-6 +- rebuilt + +* Thu Jan 13 2005 Adrian Havill 12:0.50.5-5 +- added aspell-pt_BR to the obsoletes + +* Fri Nov 12 2004 Warren Togami 12:0.50.5-4 +- rebuild + +* Wed Oct 06 2004 Than Ngo 12:0.50.5-3.fc3 +- add obsolete aspell-config + +* Mon Aug 23 2004 Adrian Havill 12:0.50.5-2.fc3 +- fix doc dir (#128140) (don't flag aspell doc stuff with the doc macro + flag due to rpm badness) + +* Mon Jun 21 2004 Warren Togami 12:0.50.5-1 +- update to 0.50.5 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jan 29 2004 Adrian Havill 12:0.50.50.3-18 +- make rpm own some unclaimed dirs (#112984, #113778) +- explicitly claim kbd anbd dat files in /usr/share/aspell +- a little spec file files cleanup-- macro subs, dir prefix +- make /usr/lib/aspell; don't make the dictionary packages do it + +* Mon Nov 17 2003 Thomas Woerner 12:0.50.3-17 +- fixed build: added make to %%build to avoid rpath for build directory + +* Tue Oct 07 2003 Adrian Havill 12:0.50.3-16 +- moved spell compat script from /usr/share/aspell to /usr/bin (#105921) + +* Tue Jul 01 2003 Adrian Havill 11:0.50.3-15 +- moved ispell compat script from /usr/share/aspell to /usr/bin (#90907) + +* Tue Jun 24 2003 Adrian Havill 10:0.50.3-14 +- removed emacs/xemacs el files which are already provided + +* Wed Jun 18 2003 Adrian Havill 9:0.50.3-13 +- provide pspell-devel in addition to obsoleting it + +* Tue Jun 10 2003 Adrian Havill 8:0.50.3-12 +- obsolete old dicts designed for previous aspell + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Fri May 30 2003 Joe Orton 7:0.50.3-10 +- rebuild again to fix libpspell deps + +* Fri May 30 2003 Joe Orton 7:0.50.3-9 +- remove ExcludeArch + +* Thu May 22 2003 Jeremy Katz 7:0.50.3-8 +- fix build with gcc 3.3 + +* Wed May 21 2003 Adrian Havill 0.50.3-7 +- require aspell-en for upgrades + +* Sun May 11 2003 Jeremy Katz 6:0.50.3-6 +- -devel should obsolete pspell-devel + +* Tue May 6 2003 Joe Orton 0.50.3-5 +- include libpspell.so in devel package + +* Thu May 1 2003 Adrian Havill 0.50.3-4 +- removed .la files + +* Wed Apr 16 2003 Adrian Havill 0.50.3-3 +- Changed the header for provides, obsoletes, epoch +- fixed config prefix in dirs.h + +* Wed Apr 16 2003 Adrian Havill 0.50.3-1 +- upgrade to 0.50.3 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Nov 8 2002 Tim Powers +- fix broken pspell epoch dep +- create $RPM_BUILD_ROOT/usr/bin by hand +- remove /usr/doc +- fix hardcoding of /usr/lib so that we can build on x86_64 + +* Tue Aug 13 2002 Nalin Dahyabhai 0.33.7.1-16 +- require pspell and pspell-devel using the proper epoch + +* Sat Aug 10 2002 Elliot Lee +- rebuilt with gcc-3.2 (we hope) + +* Mon Jul 22 2002 Tim Powers 0.33.7.1-14 +- rebuild using gcc-3.2-0.1 + +* Fri Jun 21 2002 Tim Powers 0.33.7.1-13 +- automated rebuild + +* Thu Jun 13 2002 Trond Eivind Glomsrød 0.33.7.1-12 +- Rebuild to make it work again... #66708 + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon May 13 2002 Trond Eivind Glomsrød 0.33.7.1-10 +- Rebuild + +* Thu Feb 21 2002 Trond Eivind Glomsrød 0.33.7.1-9 +- Disable evil patch + +* Mon Jan 28 2002 Trond Eivind Glomsrød 0.33.7.1-8 +- Build on more archs (doh) + +* Tue Jan 22 2002 Trond Eivind Glomsrød 0.33.7.1-7 +- Make it compile with new compiler (evil workaround) + +* Wed Jan 16 2002 Trond Eivind Glomsrød 0.33.7.1-5 +- Rebuild +- Unexclude alpha + +* Fri Dec 14 2001 Trond Eivind Glomsrød 0.33.7.1-3 +- Rebuild +- Don't build on alpha + +* Mon Oct 29 2001 Bernhard Rosenkraenzer 0.33.7.1-2 +- "make it work with gcc 3.1" ;) + +* Tue Sep 18 2001 Trond Eivind Glomsrød 0.33.7.1-1 +- 0.33.7.1, which is a "make it work with gcc 3" release + +* Wed Sep 12 2001 Tim Powers +- rebuild with new gcc and binutils + +* Thu Aug 9 2001 Trond Eivind Glomsrød 0.33.7-1 +- 0.33.7 bugfix release. Requested by the author, it fixes + coredumps in sug-mode and when not using typo-analyses. + It also contains code cleanups so it compiles with -ansi +- should fix coredump on IA64 (#49746) + +* Wed Jul 11 2001 Trond Eivind Glomsrød +- Add the .la files in the main package - used for dynamic loading + +* Sun Jun 3 2001 Trond Eivind Glomsrød +- 0.33.6.3, which includes the fix made yesterday + +* Sat Jun 2 2001 Trond Eivind Glomsrød +- Make it search for directories in the correct location + +* Wed May 30 2001 Trond Eivind Glomsrød +- No more workarounds at the specfile level + +* Tue May 29 2001 Trond Eivind Glomsrød +- Use custom ltmain.sh to work around buggy bundled libtool + +* Sun May 20 2001 Trond Eivind Glomsrød +- 0.33.6 +- use standard %%configure macro - it works now. + +* Fri May 11 2001 Bernhard Rosenkraenzer 0.33.5-2 +- Rebuild with new libltdl + +* Mon Apr 23 2001 Trond Eivind Glomsrød +- 0.33.5 + +* Thu Nov 30 2000 Trond Eivind Glomsrød +- use new emacs init scheme for Emacs and XEmacs + +* Wed Nov 22 2000 Trond Eivind Glomsrød +- .32.6 + +* Sat Aug 19 2000 Trond Eivind Glomsrød +- .32.5 bugfix release (also contains improved documentation), + obsolete old patch +- the compatibility scripts are now part of the package itself +- clean up build procedure +- remove manual.aux file from docs (#16424) + +* Sun Aug 06 2000 Trond Eivind Glomsrød +- .32.1 bugfix release, obsolete old patch +- rename to 0.32.1 +- add patch from author to change his email address +- add spell and ispell compatibility scripts + +* Fri Aug 04 2000 Trond Eivind Glomsrød +- rebuild + +* Tue Aug 01 2000 Trond Eivind Glomsrød +- remember to obsolete ispell +- build the Canadian and British dictionaries here now, + as part of the main package. Same package names and + descriptions. + +* Mon Jul 24 2000 Trond Eivind Glomsrød +- .32 +- remove old patches, add a patch since namespace isn't + polluted as much anymore (as opposed to older toolchain) + +* Wed Jul 19 2000 Trond Eivind Glomsrød +- rebuild + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jul 4 2000 Jakub Jelinek +- Rebuild with new C++ + +* Fri Jun 30 2000 Trond Eivind Glomsrød +- use RPM_OPT_FLAGS, not just -O0 +- dont include .la-files + +* Fri Jun 23 2000 Trond Eivind Glomsrød +- excludearch ia64 + +* Fri Jun 23 2000 Trond Eivind Glomsrød +- patch to work around compiler bug(?) wrt. inline functions +- use CFLAGS and CXXFLAGS +- set them to -O0 to work around YACB +- copy libtool files for IA64 support + +* Sun Jun 18 2000 Trond Eivind Glomsrød +- update to .31.1. My patch was upstreamed and is no longer needed. +- new patch added so DESTDIR works properly + +* Fri Jun 16 2000 Trond Eivind Glomsrød +- (this entry includes some old ones...) +- update to .31 +- added patch to make it compile with a pickier compiler +- include /usr/share/pspell + +* Mon May 1 2000 Tim Powers +- updated to .30.1 +- used build fixes from Ryan Weaver's 0.30.1-1 package on sourceforge +- updated URL, download/ftp location +- removed redundant define's at top of spec file + +* Thu Jul 8 1999 Tim Powers +- built for Powertools 6.1 +- removed serial macro definitions from spec file to make versioning + consistant with the other packages we ship. +- changed build root path +- general spec file cleanups + +* Tue Mar 2 1999 Ryan Weaver + [aspell-.27.2-2] +- Changes from .27.1 to .27.2 (Mar 1, 1999) +- Fixed a major bug that caused aspell to dump core when used + without any arguments +- Fixed another major bug that caused aspell to do nothing when used + in interactive mode. +- Added an option to exit in Aspell's interactive mode. +- Removed some old documentation files from the distribution. +- Minor changes on to the section on using Aspell with egcs. +- Minor changes to remove -Wall warnings.