From bcf6c1b8e06c9435e7e2915a446de702e13fec99 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Fri, 28 Nov 2008 10:18:41 +0000
Subject: [PATCH] sort out e.g. i.e. for both dictionaries for different
 reasons

---
 en_GB-singleletters.patch   | 56 +++++++++++++++++++++++++++++++++++++
 en_US-strippedabbrevs.patch |  8 ++++++
 hunspell-en.spec            | 10 ++++++-
 3 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 en_GB-singleletters.patch
 create mode 100644 en_US-strippedabbrevs.patch

diff --git a/en_GB-singleletters.patch b/en_GB-singleletters.patch
new file mode 100644
index 0000000..014929a
--- /dev/null
+++ b/en_GB-singleletters.patch
@@ -0,0 +1,56 @@
+--- wordlist.orig/en_GB.dic	2005-05-26 11:49:30.000000000 +0100
++++ wordlist/en_GB.dic	2008-11-28 10:01:37.000000000 +0000
+@@ -1,4 +1,4 @@
+-46280
++46286
+ abaft
+ abbreviation/M
+ abdicate/DNGSn
+@@ -2278,6 +2278,7 @@
+ hysterectomy/SM
+ Hyundai/M
+ ICC/M
++i
+ icebox/SM
+ icicle/SM
+ iconoclasm/MS
+@@ -2470,6 +2471,7 @@
+ Ithacan
+ its
+ ix
++j
+ jackknife/DGMS
+ Jacqueline
+ Jaeger/M
+@@ -2764,6 +2766,7 @@
+ Mabel/M
+ Macedon
+ Macedonia/M
++m
+ macintosh/SM
+ MacIntyre
+ Mackenzie
+@@ -3222,6 +3225,7 @@
+ nuttiness/S
+ nymphomaniac/S
+ Oakland/M
++o
+ ob.
+ obeyer/EM
+ obfuscation/M
+@@ -4797,6 +4801,7 @@
+ tyro/SM
+ UFO/S
+ Ukrainian/S
++u
+ ulcerate/SGNDn
+ ulcerous
+ Ulrika/M
+@@ -4962,6 +4967,7 @@
+ vulnerability/SI
+ vulva/M
+ WAC
++w
+ wagon/SM
+ waitress/MS
+ Waldemar/M
diff --git a/en_US-strippedabbrevs.patch b/en_US-strippedabbrevs.patch
new file mode 100644
index 0000000..0f4e1ee
--- /dev/null
+++ b/en_US-strippedabbrevs.patch
@@ -0,0 +1,8 @@
+--- wordlist/scowl/speller/en.dic.supp.orig	2008-11-28 10:10:01.000000000 +0000
++++ wordlist/scowl/speller/en.dic.supp	2008-11-28 10:10:10.000000000 +0000
+@@ -21,3 +21,5 @@
+ 7th/pt
+ 8th/pt
+ 9th/pt
++e.g.
++i.e.
diff --git a/hunspell-en.spec b/hunspell-en.spec
index f526491..6ae0bb8 100644
--- a/hunspell-en.spec
+++ b/hunspell-en.spec
@@ -2,12 +2,14 @@ Name: hunspell-en
 Summary: English hunspell dictionaries
 %define upstreamid 20081127
 Version: 0.%{upstreamid}
-Release: 1%{?dist}
+Release: 2%{?dist}
 #svn co https://wordlist.svn.sourceforge.net/svnroot/wordlist/trunk wordlist
 Source0: wordlist-%{upstreamid}.tar.bz2
 Source1: http://en-gb.pyxidium.co.uk/dictionary/en_GB.zip
 #See http://mxr.mozilla.org/mozilla/source/extensions/spellcheck/locales/en-US/hunspell/mozilla_words.diff?raw=1
 Patch0: mozilla_words.patch
+Patch1: en_GB-singleletters.patch
+Patch2: en_US-strippedabbrevs.patch
 Group: Applications/Text
 URL: http://wordlist.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,6 +25,8 @@ English (US, UK, etc.) hunspell dictionaries
 %setup -q -n wordlist
 %setup -q -T -D -a 1 -n wordlist
 %patch0 -p1 -b .mozilla
+%patch1 -p1 -b .singleletters
+%patch2 -p1 -b .strippedabbrevs
 
 %build
 make
@@ -60,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myspell/*
 
 %changelog
+* Thu Nov 27 2008 Caolan McNamara <caolanm@redhat.com> - 0.20081127-2
+- abbrevs are always stripped out from US/CA dicts
+- some single characters are missing from en_GB
+
 * Thu Nov 27 2008 Caolan McNamara <caolanm@redhat.com> - 0.20081127-1
 - hardcoded path dropped upstream