From a22dd8c7ff9830f0cb285eed5ad355d66f989c0e Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Wed, 19 Nov 2008 09:50:15 +0000
Subject: [PATCH] Resolves: rhbz#471085 ignore -m in ispell compatible mode
 (-a)

---
 hunspell-1.2.7-2314461.ispell-alike.patch | 78 +++++++++++++++++++++++
 hunspell.spec                             |  2 +-
 2 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 hunspell-1.2.7-2314461.ispell-alike.patch

diff --git a/hunspell-1.2.7-2314461.ispell-alike.patch b/hunspell-1.2.7-2314461.ispell-alike.patch
new file mode 100644
index 0000000..2dc6447
--- /dev/null
+++ b/hunspell-1.2.7-2314461.ispell-alike.patch
@@ -0,0 +1,78 @@
+diff -ru hunspell-1.2.7.orig/src/tools/hunspell.cxx hunspell-1.2.7/src/tools/hunspell.cxx
+--- hunspell-1.2.7.orig/src/tools/hunspell.cxx	2008-08-15 11:06:33.000000000 +0100
++++ hunspell-1.2.7/src/tools/hunspell.cxx	2008-11-19 09:13:31.000000000 +0000
+@@ -1468,9 +1468,21 @@
+ 			fprintf(stdout,gettext(HUNSPELL_PIPE_HEADING));
+ 			fflush(stdout);
+ 		} else if ((strcmp(argv[i],"-m")==0)) {
+-			filter_mode = ANALYZE;
++            /*
++             if -a was used, don't override, i.e. keep ispell compatability
++             ispell:   Make possible root/affix combinations that aren't in the dictionary.
++             hunspell: Analyze the words of the input text
++            */
++			if (filter_mode != PIPE)
++			    filter_mode = ANALYZE;
+ 		} else if ((strcmp(argv[i],"-s")==0)) {
+-			filter_mode = STEM;
++            /*
++             if -a was used, don't override, i.e. keep ispell compatability
++             ispell:   Stop itself with a SIGTSTP signal after each line of input.
++             hunspell: Stem the words of the input text
++            */
++			if (filter_mode != PIPE)
++			    filter_mode = STEM;
+ 		} else if ((strcmp(argv[i],"-t")==0)) {
+ 			format = FMT_LATEX;
+ 		} else if ((strcmp(argv[i],"-n")==0)) {
+@@ -1480,15 +1492,45 @@
+ 		} else if ((strcmp(argv[i],"-l")==0)) {
+ 			filter_mode = BADWORD;
+ 		} else if ((strcmp(argv[i],"-w")==0)) {
+-			filter_mode = WORDFILTER;
++            /*
++             if -a was used, don't override, i.e. keep ispell compatability
++             ispell:   Specify additional characters that can be part of a word.
++             hunspell: Print mispelled words (= lines) from one word/line input
++            */
++			if (filter_mode != PIPE)
++			    filter_mode = WORDFILTER;
+ 		} else if ((strcmp(argv[i],"-L")==0)) {
+-			filter_mode = BADLINE;
++            /*
++             if -a was used, don't override, i.e. keep ispell compatability
++             ispell:   Number of lines of context to be shown at the bottom of the screen
++             hunspell: Print lines with mispelled words
++            */
++			if (filter_mode != PIPE)
++			    filter_mode = BADLINE;
+ 		} else if ((strcmp(argv[i],"-u")==0)) {
+-			filter_mode = AUTO0;
++            /*
++             if -a was used, don't override, i.e. keep ispell compatability
++             ispell: None
++             hunspell: Show typical misspellings
++            */
++			if (filter_mode != PIPE)
++			    filter_mode = AUTO0;
+ 		} else if ((strcmp(argv[i],"-U")==0)) {
+-			filter_mode = AUTO;
++            /*
++             if -a was used, don't override, i.e. keep ispell compatability
++             ispell: None
++             hunspell: Automatic correction of typical misspellings to stdout
++            */
++			if (filter_mode != PIPE)
++			    filter_mode = AUTO;
+ 		} else if ((strcmp(argv[i],"-u2")==0)) {
+-			filter_mode = AUTO2;
++            /*
++             if -a was used, don't override, i.e. keep ispell compatability
++             ispell: None
++             hunspell: Print typical misspellings in sed format
++            */
++			if (filter_mode != PIPE)
++			    filter_mode = AUTO2;
+ 		} else if ((strcmp(argv[i],"-G")==0)) {
+ 			printgood = 1;
+ 		} else if ((strcmp(argv[i],"-1")==0)) {
diff --git a/hunspell.spec b/hunspell.spec
index 921f8eb..d62a319 100644
--- a/hunspell.spec
+++ b/hunspell.spec
@@ -10,7 +10,7 @@ URL:       http://hunspell.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:   LGPLv2+ or GPLv2+ or MPLv1.1
 BuildRequires: libtool, ncurses-devel
-Patch0:    hunspell-1.2.7-2314461.ispell-alike.patch
+Patch1:    hunspell-1.2.7-2314461.ispell-alike.patch
 
 %description
 Hunspell is a spell checker and morphological analyzer library and program