Hello community, here is the log from the commit of package ispell for openSUSE:Factory checked in at 2016-02-23 16:53:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ispell (Old) and /work/SRC/openSUSE:Factory/.ispell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ispell" Changes: -------- --- /work/SRC/openSUSE:Factory/ispell/ispell.changes 2015-02-16 21:21:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ispell.new/ispell.changes 2016-02-23 16:53:33.000000000 +0100 @@ -1,0 +2,31 @@ +Fri Feb 12 10:42:52 UTC 2016 - [email protected] + +- Update to ispell 3.4.00 + * The english.5 manual page has been dropped + * Ispell now supports systems (BSD) that foolish discarded backwards + compatibility and insist on using termios. + * An error has been corrected in the English affix files that caused + certain words ending in "th" to be pluralized incorrectly. The + dictionaries have been updated to ensure that no incorrect plurals + have crept in. + * The personal dictionary is now written in a stable order when there + are multiple variant capitalizations of a word. + * A bug in TeX deformatting has been corrected. Previously, two + adjacent math-mode environments introduced with dollar signs, such + as $a=b$$c=d$, would cause ispell to lose track of whether it was + in math mode. + * he American and British Makefiles have been simplified to ensure + that dictionaries are always built with the lastest information. +- Modify patches + ispell-3.3.02-config.patch + ispell-3.3.02-languages.patch + ispell-3.3.02-sq.patch + ispell-3.3.02-strip.patch + ispell-3.3.02-terminal.patch + ispell-3.3.02-types.patch + ispell-3.3.02.dif +- Remove patch ispell-3.3.02-getline.patch now upstream +- Add patch boo966124.dif that is correct typo in english.3 word + list (boo#966124) + +------------------------------------------------------------------- Old: ---- ispell-3.3.02-getline.patch ispell-3.3.02.tar.bz2 New: ---- boo966124.dif ispell-3.4.00.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ispell.spec ++++++ --- /var/tmp/diff_new_pack.lnWVZc/_old 2016-02-23 16:53:34.000000000 +0100 +++ /var/tmp/diff_new_pack.lnWVZc/_new 2016-02-23 16:53:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ispell # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,13 +26,13 @@ Requires: ispell_dictionary Requires: ispell_english_dictionary Requires: words -Version: 3.3.02 +Version: 3.4.00 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Spell Checker License: BSD-3-Clause Group: Productivity/Text/Spell -Source: ispell-3.3.02.tar.bz2 +Source: ispell-%{version}.tar.gz Source1: SuSEconfig.ispell Source2: sysconfig.ispell Patch0: ispell-3.3.02.dif @@ -45,7 +45,8 @@ Patch7: ispell-3.3.02-brkgcc.patch Patch8: ispell-3.3.02-mkdir.patch Patch9: ispell-3.3.02-strip.patch -Patch10: ispell-3.3.02-getline.patch +# PATCH-FIX-OPENSUSE correct typo (boo#966124) +Patch10: boo966124.dif %description Ispell is a fast, screen-oriented spell checker that shows you your @@ -106,26 +107,23 @@ %prep %setup -%patch -P 0 -p 0 -b .dif -%patch -P 1 -p 0 -b .config -%patch -P 2 -p 0 -b .suse -%patch -P 3 -p 0 -b .languages -%patch -P 4 -p 0 -b .types -%patch -P 5 -p 0 -b .terminal -%patch -P 6 -p 0 -b .sq -%patch -P 7 -p 0 -b .brkgcc -%patch -P 8 -p 0 -b .mkdir -%patch -P 9 -p 0 -b .strip -%patch10 +%patch0 -p 0 -b .dif +%patch1 -p 0 -b .config +%patch2 -p 0 -b .suse +%patch3 -p 0 -b .languages +%patch4 -p 0 -b .types +%patch5 -p 0 -b .terminal +%patch6 -p 0 -b .sq +%patch7 -p 0 -b .brkgcc +%patch8 -p 0 -b .mkdir +%patch9 -p 0 -b .strip +%patch10 -p 0 -b .typo %build PATH=$PATH:$PWD export PATH make local.h make config.sh - sed "s@\(DIR=\)['\"]\?\([^'\"]*\)['\"]\?@\1\"\$\{DESTDIR\}\2\"@g" \ - < config.sh > config.tmp - mv config.tmp config.sh make all %install @@ -210,7 +208,6 @@ %doc %{_mandir}/man1/sq.1.gz %doc %{_mandir}/man1/tryaffix.1.gz %doc %{_mandir}/man1/unsq.1.gz -%doc %{_mandir}/man5/english.5.gz %doc %{_mandir}/man5/ispell.5.gz %files -n ispell-american ++++++ boo966124.dif ++++++ --- languages/english/english.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- languages/english/english.3 +++ languages/english/english.3 2016-02-12 10:38:45.614320078 +0000 @@ -18067,7 +18067,7 @@ varese Varga vargas varia -variablity +variability varicella varicellate varicelloid ++++++ ispell-3.3.02-config.patch ++++++ --- /var/tmp/diff_new_pack.lnWVZc/_old 2016-02-23 16:53:34.000000000 +0100 +++ /var/tmp/diff_new_pack.lnWVZc/_new 2016-02-23 16:53:34.000000000 +0100 @@ -1,6 +1,11 @@ +--- + Makefile | 6 +++++- + local.h.linux | 41 ++++++++++++++++++++++++++++++++++++----- + 2 files changed, 41 insertions(+), 6 deletions(-) + --- Makefile -+++ Makefile 2007-05-31 17:28:33.532557680 +0200 -@@ -249,6 +249,10 @@ EXTRADICT = Use_config.sh ++++ Makefile 2016-02-12 10:10:01.744028132 +0000 +@@ -259,6 +259,10 @@ EXTRADICT = Use_config.sh SHELL = /bin/sh MAKE = make @@ -9,9 +14,9 @@ +endif + # - # Set this to "-vx" in the make command line if you need to - # debug the complex shell commands. -@@ -638,7 +642,7 @@ config.h: config.X local.h + # Prefix to apply to installation directories. This is not controlled + # by config.X; if you want to make a global change of that sort you +@@ -664,7 +668,7 @@ config.h: config.X local.h # Create a sample local.h if no such file currently exists local.h: set +e; \ @@ -21,17 +26,17 @@ msgs.h: config.sh FRC @. ./config.sh; \ --- local.h.linux -+++ local.h.linux 2007-05-31 17:48:04.745014132 +0200 -@@ -68,6 +68,8 @@ - #define GENERATE_LIBRARY_PROTOS ++++ local.h.linux 2016-02-12 10:07:16.443263742 +0000 +@@ -69,6 +69,8 @@ #define EGREPCMD "grep -Ei" #define HAS_RENAME -+#undef NO_FCNTL_H /* Define if you get compile errors on fcntl.h */ -+#undef NO_MKSTEMP /* Define if you get compile or link errors */ + #define YACC "bison -y" /* Not all linuxes have yacc, but all have bison */ ++#undef NO_FCNTL_H /* Define if you get compile errors on fcntl.h */ ++#undef NO_MKSTEMP /* Define if you get compile or link errors */ /* * Important directory paths. If you change MAN45DIR from man5 to -@@ -75,14 +77,43 @@ +@@ -76,14 +78,43 @@ * MAN45EXT (but not if you keep the man pages in section 5 and just * store them in a different place). */ ++++++ ispell-3.3.02-languages.patch ++++++ --- /var/tmp/diff_new_pack.lnWVZc/_old 2016-02-23 16:53:34.000000000 +0100 +++ /var/tmp/diff_new_pack.lnWVZc/_new 2016-02-23 16:53:34.000000000 +0100 @@ -1,302 +1,12 @@ ---- Makefile -+++ Makefile 2007-05-31 17:06:20.606915173 +0200 -@@ -399,7 +399,7 @@ install-languages: - cd $$LIBDIR; \ - if [ $$MASTERHASH != $$DEFHASH ]; then \ - rm -f $$DEFHASH; \ -- $$LINK $$MASTERHASH $$DEFHASH; \ -+ $$LINK -s $$MASTERHASH $$DEFHASH; \ - fi - - munchable: findaffix tryaffix munchlist buildhash ispell icombine -@@ -653,7 +653,7 @@ msgs.h: config.sh FRC - :; \ - else \ - set -x; \ -- rm -f msgs.h; $$LINK $$msgs msgs.h || cp $$msgs msgs.h; \ -+ rm -f msgs.h; $$LINK -s $$msgs msgs.h || cp $$msgs msgs.h; \ - fi - - FRC: ---- languages/altamer/Makefile -+++ languages/altamer/Makefile 2007-05-31 17:14:22.782151761 +0200 -@@ -164,7 +164,7 @@ install: all $(CONFIG) $(DICTSRC)/englis - cd ../..; cd $$LIBDIR; \ - chmod 644 english.aff $(HASHFILES); \ - for i in $(HASHFILES); do \ -- $$LINK $$i $(LANGUAGE).hash; \ -+ $$LINK -s $$i $(LANGUAGE).hash; \ - break; \ - done - @. $(CONFIG); \ -@@ -261,7 +261,7 @@ $(DBUILD)altamer.sml: $(DBUILD)english.s - rm -f altamer.sml - @. $(CONFIG); \ - set -x; \ -- $$LINK english.sml altamer.sml -+ $$LINK -s english.sml altamer.sml - - $(DBUILD)english.sml: $(CONFIG) - $(DBUILD)english.sml: english.0 -@@ -276,7 +276,7 @@ $(DBUILD)altamer.sml+: $(DBUILD)english. - rm -f altamer.sml+ - @. $(CONFIG); \ - set -x; \ -- $$LINK english.sml+ altamer.sml+ -+ $$LINK -s english.sml+ altamer.sml+ - - $(DBUILD)english.sml+: $(CONFIG) - $(DBUILD)english.sml+: english.0 -@@ -291,7 +291,7 @@ $(DBUILD)altamer.med: $(DBUILD)english.m - rm -f altamer.med - @. $(CONFIG); \ - set -x; \ -- $$LINK english.med altamer.med -+ $$LINK -s english.med altamer.med - - $(DBUILD)english.med: $(CONFIG) - $(DBUILD)english.med: english.0 -@@ -306,7 +306,7 @@ $(DBUILD)altamer.med+: $(DBUILD)english. - rm -f altamer.med+ - @. $(CONFIG); \ - set -x; \ -- $$LINK english.med+ altamer.med+ -+ $$LINK -s english.med+ altamer.med+ - - $(DBUILD)english.med+: $(CONFIG) - $(DBUILD)english.med+: english.0 -@@ -321,7 +321,7 @@ $(DBUILD)altamer.lrg: $(DBUILD)english.l - rm -f altamer.lrg - @. $(CONFIG); \ - set -x; \ -- $$LINK english.lrg altamer.lrg -+ $$LINK -s english.lrg altamer.lrg - - $(DBUILD)english.lrg: $(CONFIG) - $(DBUILD)english.lrg: english.0 -@@ -336,7 +336,7 @@ $(DBUILD)altamer.lrg+: $(DBUILD)english. - rm -f altamer.lrg+ - @. $(CONFIG); \ - set -x; \ -- $$LINK english.lrg+ altamer.lrg+ -+ $$LINK -s english.lrg+ altamer.lrg+ - - $(DBUILD)english.lrg+: $(CONFIG) - $(DBUILD)english.lrg+: english.0 -@@ -351,7 +351,7 @@ $(DBUILD)altamer.xlg: $(DBUILD)english.x - rm -f altamer.xlg - @. $(CONFIG); \ - set -x; \ -- $$LINK english.xlg altamer.xlg -+ $$LINK -s english.xlg altamer.xlg - - $(DBUILD)english.xlg: $(CONFIG) - $(DBUILD)english.xlg: english.0 -@@ -366,7 +366,7 @@ $(DBUILD)altamer.xlg+: $(DBUILD)english. - rm -f altamer.xlg+ - @. $(CONFIG); \ - set -x; \ -- $$LINK english.xlg+ altamer.xlg+ -+ $$LINK -s english.xlg+ altamer.xlg+ - - $(DBUILD)english.xlg+: $(CONFIG) - $(DBUILD)english.xlg+: english.0 -@@ -406,7 +406,7 @@ $(CBUILD)english.0 $(CBUILD)english.1 $( - for i in english.0 english.1 english.2 english.3 \ - american.0 american.1 american.2 altamer.0 altamer.1 altamer.2 \ - british.0 british.1 british.2; do \ -- $$LINK $(DICTSRC)/$$i . || $$LINK $(DICTSRC)/$$i . \ -+ $$LINK -s $(DICTSRC)/$$i . || $$LINK -s $(DICTSRC)/$$i . \ - || cp $(DICTSRC)/$$i .; \ - done - ---- languages/american/Makefile -+++ languages/american/Makefile 2007-05-31 17:14:55.169592468 +0200 -@@ -167,7 +167,7 @@ install: all $(CONFIG) $(DICTSRC)/englis - cd ../..; cd $$LIBDIR; \ - chmod 644 english.aff $(HASHFILES); \ - for i in $(HASHFILES); do \ -- $$LINK $$i $(LANGUAGE).hash; \ -+ $$LINK -s $$i $(LANGUAGE).hash; \ - break; \ - done - @. $(CONFIG); \ -@@ -264,7 +264,7 @@ $(DBUILD)american.sml: $(DBUILD)english. - rm -f american.sml - @. $(CONFIG); \ - set -x; \ -- $$LINK english.sml american.sml -+ $$LINK -s english.sml american.sml - - $(DBUILD)english.sml: $(CONFIG) - $(DBUILD)english.sml: english.0 -@@ -278,7 +278,7 @@ $(DBUILD)american.sml+: $(DBUILD)english - rm -f american.sml+ - @. $(CONFIG); \ - set -x; \ -- $$LINK english.sml+ american.sml+ -+ $$LINK -s english.sml+ american.sml+ - - $(DBUILD)english.sml+: $(CONFIG) - $(DBUILD)english.sml+: english.0 -@@ -292,7 +292,7 @@ $(DBUILD)american.med: $(DBUILD)english. - rm -f american.med - @. $(CONFIG); \ - set -x; \ -- $$LINK english.med american.med -+ $$LINK -s english.med american.med - - $(DBUILD)english.med: $(CONFIG) - $(DBUILD)english.med: english.0 -@@ -306,7 +306,7 @@ $(DBUILD)american.med+: $(DBUILD)english - rm -f american.med+ - @. $(CONFIG); \ - set -x; \ -- $$LINK english.med+ american.med+ -+ $$LINK -s english.med+ american.med+ - - $(DBUILD)english.med+: $(CONFIG) - $(DBUILD)english.med+: english.0 -@@ -320,7 +320,7 @@ $(DBUILD)american.lrg: $(DBUILD)english. - rm -f american.lrg - @. $(CONFIG); \ - set -x; \ -- $$LINK english.lrg american.lrg -+ $$LINK -s english.lrg american.lrg - - $(DBUILD)english.lrg: $(CONFIG) - $(DBUILD)english.lrg: english.0 -@@ -334,7 +334,7 @@ $(DBUILD)american.lrg+: $(DBUILD)english - rm -f american.lrg+ - @. $(CONFIG); \ - set -x; \ -- $$LINK english.lrg+ american.lrg+ -+ $$LINK -s english.lrg+ american.lrg+ - - $(DBUILD)english.lrg+: $(CONFIG) - $(DBUILD)english.lrg+: english.0 -@@ -348,7 +348,7 @@ $(DBUILD)american.xlg: $(DBUILD)english. - rm -f american.xlg - @. $(CONFIG); \ - set -x; \ -- $$LINK english.xlg american.xlg -+ $$LINK -s english.xlg american.xlg - - $(DBUILD)english.xlg: $(CONFIG) - $(DBUILD)english.xlg: english.0 -@@ -362,7 +362,7 @@ $(DBUILD)american.xlg+: $(DBUILD)english - rm -f american.xlg+ - @. $(CONFIG); \ - set -x; \ -- $$LINK english.xlg+ american.xlg+ -+ $$LINK -s english.xlg+ american.xlg+ - - $(DBUILD)english.xlg+: $(CONFIG) - $(DBUILD)english.xlg+: english.0 -@@ -401,7 +401,7 @@ $(CBUILD)english.0 $(CBUILD)english.1 $( - for i in english.0 english.1 english.2 english.3 \ - american.0 american.1 american.2 altamer.0 altamer.1 altamer.2 \ - british.0 british.1 british.2; do \ -- $$LINK $(DICTSRC)/$$i . || $$LINK $(DICTSRC)/$$i . \ -+ $$LINK -s $(DICTSRC)/$$i . || $$LINK -s $(DICTSRC)/$$i . \ - || cp $(DICTSRC)/$$i .; \ - done - ---- languages/british/Makefile -+++ languages/british/Makefile 2007-05-31 17:15:36.501983304 +0200 -@@ -167,7 +167,7 @@ install: all $(CONFIG) $(DICTSRC)/englis - cd ../..; cd $$LIBDIR; \ - chmod 644 english.aff $(HASHFILES); \ - for i in $(HASHFILES); do \ -- $$LINK $$i $(LANGUAGE).hash; \ -+ $$LINK -s $$i $(LANGUAGE).hash; \ - break; \ - done - @. $(CONFIG); \ -@@ -264,7 +264,7 @@ $(DBUILD)british.sml: $(DBUILD)english.s - rm -f british.sml - @. $(CONFIG); \ - set -x; \ -- $$LINK english.sml british.sml -+ $$LINK -s english.sml british.sml - - $(DBUILD)english.sml: $(CONFIG) - $(DBUILD)english.sml: english.0 -@@ -278,7 +278,7 @@ $(DBUILD)british.sml+: $(DBUILD)english. - rm -f british.sml+ - @. $(CONFIG); \ - set -x; \ -- $$LINK english.sml+ british.sml+ -+ $$LINK -s english.sml+ british.sml+ - - $(DBUILD)english.sml+: $(CONFIG) - $(DBUILD)english.sml+: english.0 -@@ -292,7 +292,7 @@ $(DBUILD)british.med: $(DBUILD)english.m - rm -f british.med - @. $(CONFIG); \ - set -x; \ -- $$LINK english.med british.med -+ $$LINK -s english.med british.med - - $(DBUILD)english.med: $(CONFIG) - $(DBUILD)english.med: english.0 -@@ -306,7 +306,7 @@ $(DBUILD)british.med+: $(DBUILD)english. - rm -f british.med+ - @. $(CONFIG); \ - set -x; \ -- $$LINK english.med+ british.med+ -+ $$LINK -s english.med+ british.med+ - - $(DBUILD)english.med+: $(CONFIG) - $(DBUILD)english.med+: english.0 -@@ -320,7 +320,7 @@ $(DBUILD)british.lrg: $(DBUILD)english.l - rm -f british.lrg - @. $(CONFIG); \ - set -x; \ -- $$LINK english.lrg british.lrg -+ $$LINK -s english.lrg british.lrg - - $(DBUILD)english.lrg: $(CONFIG) - $(DBUILD)english.lrg: english.0 -@@ -334,7 +334,7 @@ $(DBUILD)british.lrg+: $(DBUILD)english. - rm -f british.lrg+ - @. $(CONFIG); \ - set -x; \ -- $$LINK english.lrg+ british.lrg+ -+ $$LINK -s english.lrg+ british.lrg+ - - $(DBUILD)english.lrg+: $(CONFIG) - $(DBUILD)english.lrg+: english.0 -@@ -348,7 +348,7 @@ $(DBUILD)british.xlg: $(DBUILD)english.x - rm -f british.xlg - @. $(CONFIG); \ - set -x; \ -- $$LINK english.xlg british.xlg -+ $$LINK -s english.xlg british.xlg - - $(DBUILD)english.xlg: $(CONFIG) - $(DBUILD)english.xlg: english.0 -@@ -362,7 +362,7 @@ $(DBUILD)british.xlg+: $(DBUILD)english. - rm -f british.xlg+ - @. $(CONFIG); \ - set -x; \ -- $$LINK english.xlg+ british.xlg+ -+ $$LINK -s english.xlg+ british.xlg+ - - $(DBUILD)english.xlg+: $(CONFIG) - $(DBUILD)english.xlg+: english.0 -@@ -401,7 +401,7 @@ $(CBUILD)english.0 $(CBUILD)english.1 $( - for i in english.0 english.1 english.2 english.3 \ - american.0 american.1 american.2 altamer.0 altamer.1 altamer.2 \ - british.0 british.1 british.2; do \ -- $$LINK $(DICTSRC)/$$i . || $$LINK $(DICTSRC)/$$i . \ -+ $$LINK -s $(DICTSRC)/$$i . || $$LINK -s $(DICTSRC)/$$i . \ - || cp $(DICTSRC)/$$i .; \ - done - +--- + languages/deutsch/Makefile | 67 +++++++++++++++++++++++++++++++++---------- + languages/espanol/Makefile | 3 + + languages/portugues/Makefile | 1 + 3 files changed, 55 insertions(+), 16 deletions(-) + --- languages/deutsch/Makefile -+++ languages/deutsch/Makefile 2007-05-31 17:20:24.956641899 +0200 -@@ -101,8 +101,31 @@ FIX8BIT = ../fix8bit ++++ languages/deutsch/Makefile 2016-02-12 10:24:20.859219566 +0000 +@@ -104,8 +104,31 @@ FIX8BIT = ../fix8bit # If you change DICTOPTIONS in your local.h file, you will have to do # "make dictclean" to clear out the old dictionary before you re-make. # @@ -330,7 +40,7 @@ # # The following variables may be overridden by the superior Makefile, -@@ -118,7 +141,7 @@ AFFIXES = deutsch.aff +@@ -121,7 +144,7 @@ AFFIXES = deutsch.aff # SHELLDEBUG = +vx @@ -339,20 +49,20 @@ install: all $(CONFIG) @. $(CONFIG); \ -@@ -126,21 +149,28 @@ install: all $(CONFIG) +@@ -129,21 +152,28 @@ install: all $(CONFIG) cd ../..; \ - [ -d $$LIBDIR ] || \ - $(MAKE) -f ../../Makefile NEWDIR=$$LIBDIR mkdirpath; \ -- cd $$LIBDIR; rm -f deutsch.aff deutsch.hash -+ cd $$LIBDIR; rm -f deutsch.aff deutschmed.hash deutschlxg.hash + [ -d $(DESTDIR)$$LIBDIR ] || \ + $(MAKE) -f Makefile NEWDIR=$(DESTDIR)$$LIBDIR mkdirpath; \ +- cd $(DESTDIR)$$LIBDIR; rm -f deutsch.aff deutsch.hash ++ cd $(DESTDIR)$$LIBDIR; rm -f deutsch.aff deutschmed.hash deutschlxg.hash @. $(CONFIG); \ set -x; \ - cp deutsch.aff deutsch.hash \ + cp deutsch.aff deutschmed.hash deutschlxg.hash \ - `cd ../..; cd $$LIBDIR; pwd` + `cd ../..; cd $(DESTDIR)$$LIBDIR; pwd` @. $(CONFIG); \ set -x; \ - cd ../..; cd $$LIBDIR; \ + cd ../..; cd $(DESTDIR)$$LIBDIR; \ - chmod 644 deutsch.aff deutsch.hash + chmod 644 deutsch.aff deutschmed.hash deutschlxg.hash @@ -375,7 +85,7 @@ $(FIX8BIT) -8 < deutsch.7bit > $(AFFIXES) deutsch-alt.aff: deutsch-alt.7bit $(FIX8BIT) -@@ -149,10 +179,17 @@ deutsch-alt.aff: deutsch-alt.7bit $(FIX8 +@@ -152,10 +182,17 @@ deutsch-alt.aff: deutsch-alt.7bit $(FIX8 $(FIX8BIT): ../fix8bit.c cd ..; $(MAKE) fix8bit @@ -397,7 +107,7 @@ # # The following dependency can be executed when ispell is unpacked, -@@ -176,7 +213,7 @@ kitclean: +@@ -179,7 +216,7 @@ kitclean: # dictionary file. # dictclean: @@ -406,38 +116,9 @@ # required to be present in all other language Makefiles as # well, even though it doesn't have to do anything in those ---- languages/english/english.5X -+++ languages/english/english.5X 2007-05-31 17:22:22.777163622 +0200 -@@ -56,7 +56,7 @@ - .\" Get rid of all old RCS log lines in preparation for the 3.1 release. - .\" - .\" --.TH ENGLISH 4 -+.TH ENGLISH !!MAN45SECT!! - .SH NAME - english \- flag format for English \fIispell\fP dictionaries - .SH DESCRIPTION -@@ -66,7 +66,7 @@ supports 3 prefix and 14 suffix flags. - For a detailed description of how - .I ispell - handles flags and capitalization, see --.IR ispell (4). -+.IR ispell (!!MAN45SECT!!). - This manual page only describes flags usable in dictionaries built - using the - .I english.aff -@@ -85,7 +85,7 @@ produced by placing the "D" flag on "we" - .PP - In the following list, an asterisk indicates that a flag participates in - cross-product formation (see --.IR ispell (4)). -+.IR ispell (!!MAN45SECT!!)). - .PP - The meaning of the prefix flags is as follows: - .IP "*A" --- languages/espanol/Makefile -+++ languages/espanol/Makefile 2007-05-31 17:23:30.544365139 +0200 -@@ -58,6 +58,7 @@ MAKE = make ++++ languages/espanol/Makefile 2016-02-12 10:11:13.518623356 +0000 +@@ -61,6 +61,7 @@ MAKE = make CONFIG = ../../config.sh PATHADDER = ../.. BUILDHASH = ../../buildhash @@ -445,7 +126,7 @@ FIX8BIT = ../fix8bit # -@@ -65,7 +66,7 @@ FIX8BIT = ../fix8bit +@@ -68,7 +69,7 @@ FIX8BIT = ../fix8bit # numerous languages. # LANGUAGE = espanol @@ -454,29 +135,9 @@ HASHFILE = $(LANGUAGE).hash # -@@ -85,6 +86,19 @@ all: $(HASHFILE) - install: all $(CONFIG) - @. $(CONFIG); \ - set -x; \ -+ [ -d $$LIBDIR ] || (mkdir $$LIBDIR; chmod 755 $$LIBDIR); \ -+ cd $$LIBDIR; rm -f $(LANGUAGE).aff $(HASHFILE) -+ @. $(CONFIG); \ -+ set -x; \ -+ cp $(LANGUAGE).aff $(HASHFILE) $$LIBDIR -+ @. $(CONFIG); \ -+ set -x; \ -+ cd $$LIBDIR; \ -+ chmod 644 $(LANGUAGE).aff $(HASHFILE) -+ -+install: all $(CONFIG) -+ @. $(CONFIG); \ -+ set -x; \ - cd ../..; \ - [ -d $$LIBDIR ] || \ - $(MAKE) -f ../../Makefile NEWDIR=$$LIBDIR mkdirpath; \ --- languages/portugues/Makefile -+++ languages/portugues/Makefile 2007-05-31 17:24:27.034367889 +0200 -@@ -72,6 +72,7 @@ MAKE = make ++++ languages/portugues/Makefile 2016-02-12 10:11:13.518623356 +0000 +@@ -75,6 +75,7 @@ MAKE = make CONFIG = ../../config.sh PATHADDER = ../.. BUILDHASH = ../../buildhash @@ -484,23 +145,3 @@ FIX8BIT = ../fix8bit # -@@ -99,6 +100,19 @@ all: $(HASHFILE) - install: all $(CONFIG) - @. $(CONFIG); \ - set -x; \ -+ [ -d $$LIBDIR ] || (mkdir $$LIBDIR; chmod 755 $$LIBDIR); \ -+ cd $$LIBDIR; rm -f $(LANGUAGE).aff $(HASHFILE) -+ @. $(CONFIG); \ -+ set -x; \ -+ cp $(LANGUAGE).aff $(HASHFILE) $$LIBDIR -+ @. $(CONFIG); \ -+ set -x; \ -+ cd $$LIBDIR; \ -+ chmod 644 $(LANGUAGE).aff $(HASHFILE) -+ -+install: all $(CONFIG) -+ @. $(CONFIG); \ -+ set -x; \ - cd ../..; \ - [ -d $$LIBDIR ] || \ - $(MAKE) -f ../../Makefile NEWDIR=$$LIBDIR mkdirpath; \ ++++++ ispell-3.3.02-sq.patch ++++++ --- /var/tmp/diff_new_pack.lnWVZc/_old 2016-02-23 16:53:34.000000000 +0100 +++ /var/tmp/diff_new_pack.lnWVZc/_new 2016-02-23 16:53:34.000000000 +0100 @@ -1,6 +1,12 @@ +--- + Makefile | 10 +++++++--- + sq.c | 36 ++++++++++++++++++++++-------------- + unsq.c | 31 +++++++++++++++++++------------ + 3 files changed, 48 insertions(+), 29 deletions(-) + --- Makefile -+++ Makefile 2007-05-31 16:37:29.331247861 +0200 -@@ -261,7 +261,7 @@ all: all-languages ++++ Makefile 2016-02-12 10:34:00.287895315 +0000 +@@ -286,7 +286,7 @@ all: all-languages programs: buildhash findaffix tryaffix ispell programs: icombine ijoin munchlist @@ -9,34 +15,34 @@ defmt-programs: cd deformatters; $(MAKE) all -@@ -320,11 +320,15 @@ install-basic: +@@ -345,11 +345,15 @@ install-basic: @. ./config.sh; \ set -x; \ - $$INSTALL ispell.1 $$MAN1DIR/ispell$$MAN1EXT; \ -- $$INSTALL ispell.5 $$MAN45DIR/ispell$$MAN45EXT -+ $$INSTALL ispell.5 $$MAN45DIR/ispell$$MAN45EXT; \ -+ $$INSTALL sq.1 $$MAN1DIR/sq$$MAN1EXT; \ -+ echo .so man1/sq.1 > $$MAN1DIR/unsq$$MAN1EXT + $$INSTALL ispell.1 $(DESTDIR)$$MAN1DIR/ispell$$MAN1EXT; \ +- $$INSTALL ispell.5 $(DESTDIR)$$MAN45DIR/ispell$$MAN45EXT ++ $$INSTALL ispell.5 $(DESTDIR)$$MAN45DIR/ispell$$MAN45EXT; \ ++ $$INSTALL sq.1 $(DESTDIR)$$MAN1DIR/sq$$MAN1EXT; \ ++ echo .so man1/sq.1 > $(DESTDIR)$$MAN1DIR/unsq$$MAN1EXT @. ./config.sh; \ set -x; \ - cd $$MAN1DIR; \ + cd $(DESTDIR)$$MAN1DIR; \ chmod 644 ispell$$MAN1EXT; \ + chmod 644 sq$$MAN1EXT; \ + chmod 644 unsq$$MAN1EXT; \ - cd $$MAN45DIR; \ - chmod 644 ispell$$MAN45EXT + cd $(DESTDIR)$$MAN45DIR; \ + chmod 644 ispell$$MAN45EXT -@@ -357,7 +361,7 @@ install-dictbuild: +@@ -383,7 +387,7 @@ install-dictbuild: @. ./config.sh; \ set -x; \ $$INSTALL buildhash icombine ijoin munchlist findaffix \ - tryaffix \ + tryaffix sq unsq \ - $$BINDIR + $(DESTDIR)$$BINDIR @. ./config.sh; \ set -x; \ --- sq.c -+++ sq.c 2007-05-31 16:24:23.215866303 +0200 ++++ sq.c 2016-02-12 10:31:20.083026011 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = @@ -107,7 +113,7 @@ wordp = word; prevp = prev; -@@ -113,7 +121,7 @@ static void trunc (word, prev) +@@ -113,7 +121,7 @@ static void trunc (word, prev) if (same_count>MAX_PREFIX) same_count = MAX_PREFIX; (void) putchar (size_encodings[same_count]); @@ -117,7 +123,7 @@ } --- unsq.c -+++ unsq.c 2007-05-31 16:27:53.326157111 +0200 ++++ unsq.c 2016-02-12 10:31:20.083026011 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = @@ -194,7 +200,7 @@ { (void) fprintf (stderr, UNSQ_C_BAD_COUNT, (unsigned int) count_char); exit (1); -@@ -126,11 +129,15 @@ static int expand (word, prev) +@@ -126,11 +129,15 @@ static int expand (word, prev) wordp = word; while (same_count--) *wordp++ = (*prevp++); ++++++ ispell-3.3.02-strip.patch ++++++ --- /var/tmp/diff_new_pack.lnWVZc/_old 2016-02-23 16:53:34.000000000 +0100 +++ /var/tmp/diff_new_pack.lnWVZc/_new 2016-02-23 16:53:34.000000000 +0100 @@ -1,17 +1,21 @@ +--- + Makefile | 2 -- + 1 file changed, 2 deletions(-) + --- Makefile -+++ Makefile 2007-05-31 18:32:00.212899117 +0200 -@@ -311,7 +311,6 @@ install-basic: ++++ Makefile 2016-02-12 10:35:12.834477699 +0000 +@@ -332,7 +332,6 @@ install-basic: @. ./config.sh; \ set -x; \ - cd $$BINDIR; \ + cd $(DESTDIR)$$BINDIR; \ - strip ispell$$EXEEXT; \ chmod 755 ispell$$EXEEXT @. ./config.sh; \ set -x; \ -@@ -370,7 +369,6 @@ install-dictbuild: +@@ -392,7 +391,6 @@ install-dictbuild: @. ./config.sh; \ set -x; \ - cd $$BINDIR; \ + cd $(DESTDIR)$$BINDIR; \ - strip buildhash$$EXEEXT icombine$$EXEEXT ijoin$$EXEEXT; \ chmod 755 buildhash$$EXEEXT icombine$$EXEEXT ijoin$$EXEEXT \ munchlist findaffix tryaffix ++++++ ispell-3.3.02-terminal.patch ++++++ --- /var/tmp/diff_new_pack.lnWVZc/_old 2016-02-23 16:53:34.000000000 +0100 +++ /var/tmp/diff_new_pack.lnWVZc/_new 2016-02-23 16:53:34.000000000 +0100 @@ -1,6 +1,12 @@ +--- + correct.c | 1 + + ispell.h | 5 +++++ + term.c | 19 +++++++++++++++++++ + 3 files changed, 25 insertions(+) + --- correct.c -+++ correct.c 2007-05-31 18:03:19.794187729 +0200 -@@ -201,6 +201,7 @@ static char Rcs_Id[] = ++++ correct.c 2016-02-12 11:01:38.867627625 +0000 +@@ -204,6 +204,7 @@ static char Rcs_Id[] = */ #include <ctype.h> @@ -9,7 +15,7 @@ #include "ispell.h" #include "proto.h" --- ispell.h -+++ ispell.h 2007-05-31 18:04:06.795177229 +0200 ++++ ispell.h 2016-02-12 11:01:38.867627625 +0000 @@ -143,6 +143,7 @@ #include "config.h" @@ -31,19 +37,8 @@ EXTERN char * cl; /* clear display */ EXTERN char * cm; /* cursor movement */ --- term.c -+++ term.c 2007-05-31 18:18:53.861317891 +0200 -@@ -87,13 +87,20 @@ static char Rcs_Id[] = - #include "proto.h" - #include "msgs.h" - #ifdef USG -+#if defined(__GLIBC__) && __GLIBC__ >= 2 -+#include <termios.h> -+#else - #include <termio.h> -+#endif - #else - #ifndef __DJGPP__ - #include <sgtty.h> ++++ term.c 2016-02-12 11:02:21.858794671 +0000 +@@ -99,6 +99,9 @@ static char Rcs_Id[] = #endif #endif #include <signal.h> @@ -53,21 +48,7 @@ void ierase P ((void)); void imove P ((int row, int col)); -@@ -166,8 +173,13 @@ static int iputch (c) - } - - #ifdef USG -+#if defined(__GLIBC__) && __GLIBC__ >= 2 -+static struct termios sbuf; -+static struct termios osbuf; -+#else - static struct termio sbuf; - static struct termio osbuf; -+#endif - #else - static struct sgttyb sbuf; - static struct sgttyb osbuf; -@@ -190,9 +202,13 @@ void terminit () +@@ -198,9 +201,13 @@ void terminit () int tpgrp; #else #ifdef TIOCGPGRP @@ -81,7 +62,7 @@ #ifdef TIOCGWINSZ struct winsize wsize; #endif /* TIOCGWINSZ */ -@@ -276,7 +292,11 @@ retry: +@@ -304,7 +311,11 @@ retry: (void) fprintf (stderr, TERM_C_NO_BATCH); exit (1); } @@ -93,7 +74,7 @@ termchanged = 1; sbuf = osbuf; -@@ -285,7 +305,11 @@ retry: +@@ -313,7 +324,11 @@ retry: sbuf.c_iflag &= ~(INLCR | IGNCR | ICRNL); sbuf.c_cc[VMIN] = 1; sbuf.c_cc[VTIME] = 1; @@ -105,7 +86,7 @@ uerasechar = osbuf.c_cc[VERASE]; ukillchar = osbuf.c_cc[VKILL]; -@@ -298,7 +322,11 @@ retry: +@@ -326,7 +341,11 @@ retry: #endif #endif #ifdef TIOCGPGRP @@ -117,87 +98,3 @@ { (void) fprintf (stderr, TERM_C_NO_BATCH); exit (1); -@@ -373,7 +401,11 @@ SIGNAL_TYPE done (signo) - if (te) - tputs (te, 1, iputch); - #ifdef USG -+#if defined(__GLIBC__) && __GLIBC__ >= 2 -+ (void) tcsetattr (0, TCSADRAIN, &osbuf); -+#else - (void) ioctl (0, TCSETAW, (char *) &osbuf); -+#endif - #else - (void) ioctl (0, TIOCSETP, (char *) &osbuf); - #ifdef TIOCSLTC -@@ -394,7 +426,11 @@ static SIGNAL_TYPE onstop (signo) - if (te) - tputs (te, 1, iputch); - #ifdef USG -+#if defined(__GLIBC__) && __GLIBC__ >= 2 -+ (void) tcsetattr (0, TCSADRAIN, &osbuf); -+#else - (void) ioctl (0, TCSETAW, (char *) &osbuf); -+#endif - #else - (void) ioctl (0, TIOCSETP, (char *) &osbuf); - #ifdef TIOCSLTC -@@ -413,7 +449,11 @@ static SIGNAL_TYPE onstop (signo) - if (termchanged) - { - #ifdef USG -+#if defined(__GLIBC__) && __GLIBC__ >= 2 -+ (void) tcsetattr (0, TCSADRAIN, &sbuf); -+#else - (void) ioctl (0, TCSETAW, (char *) &sbuf); -+#endif - #else - (void) ioctl (0, TIOCSETP, (char *) &sbuf); - #ifdef TIOCSLTC -@@ -481,7 +521,11 @@ int shellescape (buf) - argv[i] = NULL; - - #ifdef USG -+#if defined(__GLIBC__) && __GLIBC__ >= 2 -+ (void) tcsetattr (0, TCSADRAIN, &osbuf); -+#else - (void) ioctl (0, TCSETAW, (char *) &osbuf); -+#endif - #else - (void) ioctl (0, TIOCSETP, (char *) &osbuf); - #ifdef TIOCSLTC -@@ -527,7 +571,11 @@ int shellescape (buf) - #endif - - #ifdef USG -+#if defined(__GLIBC__) && __GLIBC__ >= 2 -+ (void) tcsetattr (0, TCSADRAIN, &sbuf); -+#else - (void) ioctl (0, TCSETAW, (char *) &sbuf); -+#endif - #else - (void) ioctl (0, TIOCSETP, (char *) &sbuf); - #ifdef TIOCSLTC -@@ -563,7 +611,11 @@ void shescape (buf) - #endif - - #ifdef USG -+#if defined(__GLIBC__) && __GLIBC__ >= 2 -+ (void) tcsetattr (0, TCSADRAIN, &osbuf); -+#else - (void) ioctl (0, TCSETAW, (char *) &osbuf); -+#endif - #else - (void) ioctl (0, TIOCSETP, (char *) &osbuf); - #ifdef TIOCSLTC -@@ -611,7 +663,11 @@ void shescape (buf) - #endif - - #ifdef USG -+#if defined(__GLIBC__) && __GLIBC__ >= 2 -+ (void) tcsetattr (0, TCSADRAIN, &sbuf); -+#else - (void) ioctl (0, TCSETAW, (char *) &sbuf); -+#endif - #else - (void) ioctl (0, TIOCSETP, (char *) &sbuf); - #ifdef TIOCSLTC ++++++ ispell-3.3.02-types.patch ++++++ --- /var/tmp/diff_new_pack.lnWVZc/_old 2016-02-23 16:53:34.000000000 +0100 +++ /var/tmp/diff_new_pack.lnWVZc/_new 2016-02-23 16:53:34.000000000 +0100 @@ -1,6 +1,12 @@ +--- + config.X | 1 + + ispell.c | 1 + + lookup.c | 5 +++++ + 3 files changed, 7 insertions(+) + --- config.X -+++ config.X 2007-05-31 17:58:34.971948256 +0200 -@@ -212,6 +212,7 @@ ++++ config.X 2016-02-12 10:26:09.229101356 +0000 +@@ -218,6 +218,7 @@ #undef USG /* Define this in local.h for System V machines */ #endif /* USG */ @@ -9,7 +15,7 @@ #include <sys/types.h> #ifndef USG --- ispell.c -+++ ispell.c 2007-05-31 17:56:56.177457827 +0200 ++++ ispell.c 2016-02-12 10:26:09.229101356 +0000 @@ -231,6 +231,7 @@ static char Rcs_Id[] = #include "msgs.h" #include "version.h" @@ -19,7 +25,7 @@ #include <fcntl.h> #endif /* NO_FCNTL_H */ --- lookup.c -+++ lookup.c 2007-05-31 17:57:23.772388056 +0200 ++++ lookup.c 2016-02-12 10:26:09.229101356 +0000 @@ -89,6 +89,11 @@ static char Rcs_Id[] = #include "ispell.h" #include "proto.h" ++++++ ispell-3.3.02.dif ++++++ --- /var/tmp/diff_new_pack.lnWVZc/_old 2016-02-23 16:53:34.000000000 +0100 +++ /var/tmp/diff_new_pack.lnWVZc/_new 2016-02-23 16:53:34.000000000 +0100 @@ -1,5 +1,17 @@ +--- + .pkgextract | 9 +++++++++ + buildhash.c | 4 ++++ + defmt.c | 8 ++++++++ + fields.c | 8 ++++++++ + icombine.c | 4 ++++ + ijoin.c | 4 ++++ + ispell.c | 4 ++++ + languages/english/msgs.h | 8 ++++---- + munchlist.X | 34 ++++++++++++++++++---------------- + 9 files changed, 63 insertions(+), 20 deletions(-) + --- .pkgextract -+++ .pkgextract 2004-12-21 15:18:58.000000000 +0000 ++++ .pkgextract 2016-02-12 10:00:43.934930433 +0000 @@ -0,0 +1,9 @@ +patch -p0 -s --backup --suffix=.config < ../ispell-3.3.02-config.patch +patch -p0 -s --backup --suffix=.suse < ../ispell-3.2.06-suse.patch @@ -11,8 +23,8 @@ +patch -p0 -s --backup --suffix=.mkdir < ../ispell-3.3.02-mkdir.patch +patch -p0 -s --backup --suffix=.strip < ../ispell-3.3.02-strip.patch --- buildhash.c -+++ buildhash.c 2004-12-21 15:46:20.000000000 +0000 -@@ -112,6 +112,7 @@ static char Rcs_Id[] = ++++ buildhash.c 2016-02-12 10:00:43.934930433 +0000 +@@ -116,6 +116,7 @@ static char Rcs_Id[] = #include "version.h" #include <ctype.h> #include <sys/stat.h> @@ -20,7 +32,7 @@ int main P ((int argc, char * argv[])); static void output P ((void)); -@@ -145,6 +146,9 @@ int main (argc, argv) +@@ -149,6 +150,9 @@ int main (argc, argv) unsigned int i; int j; @@ -31,8 +43,8 @@ { argc--; --- defmt.c -+++ defmt.c 2004-12-21 15:18:58.000000000 +0000 -@@ -686,6 +686,14 @@ void checkline (ofile) ++++ defmt.c 2016-02-12 10:00:43.934930433 +0000 +@@ -704,6 +704,14 @@ void checkline (ofile) p = ctoken; endp = skipoverword (currentchar); @@ -48,7 +60,7 @@ *p++ = *currentchar++; *p = 0; --- fields.c -+++ fields.c 2004-12-21 15:31:41.000000000 +0000 ++++ fields.c 2016-02-12 10:00:43.934930433 +0000 @@ -112,6 +112,7 @@ field_t * fieldread (file, delims, flags if (linesize == 0) { @@ -74,7 +86,7 @@ + fieldp = NULL; } --- icombine.c -+++ icombine.c 2007-05-31 14:47:20.000000000 +0000 ++++ icombine.c 2016-02-12 10:00:43.934930433 +0000 @@ -89,6 +89,7 @@ static char Rcs_Id[] = #include "ispell.h" #include "proto.h" @@ -94,7 +106,7 @@ { argc--; --- ijoin.c -+++ ijoin.c 2004-12-21 15:46:28.000000000 +0000 ++++ ijoin.c 2016-02-12 10:00:43.934930433 +0000 @@ -119,6 +119,7 @@ static char Rcs_Id[] = #include "ispell.h" #include "proto.h" @@ -114,8 +126,8 @@ { argc--; --- ispell.c -+++ ispell.c 2007-05-31 15:56:56.000000000 +0000 -@@ -236,6 +236,7 @@ static char Rcs_Id[] = ++++ ispell.c 2016-02-12 10:00:43.934930433 +0000 +@@ -235,6 +235,7 @@ static char Rcs_Id[] = #include <fcntl.h> #endif /* NO_FCNTL_H */ #include <sys/stat.h> @@ -123,7 +135,7 @@ static void usage P ((void)); int main P ((int argc, char * argv[])); -@@ -283,6 +284,9 @@ int main (argc, argv) +@@ -282,6 +283,9 @@ int main (argc, argv) Trynum = 0; @@ -134,8 +146,8 @@ if (p == NULL) (void) strcpy (libdir, LIBDIR); --- languages/english/msgs.h -+++ languages/english/msgs.h 2007-05-31 17:05:33.000000000 +0000 -@@ -182,10 +182,10 @@ ++++ languages/english/msgs.h 2016-02-12 10:00:43.934930433 +0000 +@@ -185,10 +185,10 @@ #define CORR_C_HELP_4 "next to each one. You have the option of replacing the word%s\n" #define CORR_C_HELP_5 "completely, or choosing one of the suggested words.%s\n" /* You may add HELP_6 through HELP_9 if your language needs more lines */ @@ -151,7 +163,7 @@ #define CORR_C_HELP_R_CMD "R Replace the misspelled word completely.%s\n" #define CORR_C_HELP_BLANK "Space Accept the word this time only.%s\n" --- munchlist.X -+++ munchlist.X 2013-12-06 13:08:15.718454418 +0000 ++++ munchlist.X 2016-02-12 10:04:10.134904775 +0000 @@ -191,7 +191,7 @@ then echo "munchlist $*" 1>&2 set -vx @@ -165,13 +177,13 @@ # But that doesn't excuse breaking compatibility.) # # Detect whether sort accepts old-style switches. --if sort +0 -1 /dev/null >/dev/null 2>&1 +-if sort +0 /dev/null >/dev/null 2>&1 -then - CRETIN_SORT=false -else - CRETIN_SORT=true -fi -+##if sort +0 -1 /dev/null >/dev/null 2>&1 ++##if sort +0 /dev/null >/dev/null 2>&1 +##then +## CRETIN_SORT=false +##else
