From 4f20bed1a09ce833f3d59ad5364de4d5d199769e Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Thu, 3 Jan 2008 15:51:56 +0000
Subject: [PATCH] add hunspell-1.2.1-1863239.badstructs.patch

---
 hunspell-1.2.1-1863239.badstructs.patch | 165 ++++++++++++++++++++++++
 hunspell.spec                           |   7 +-
 2 files changed, 171 insertions(+), 1 deletion(-)
 create mode 100644 hunspell-1.2.1-1863239.badstructs.patch

diff --git a/hunspell-1.2.1-1863239.badstructs.patch b/hunspell-1.2.1-1863239.badstructs.patch
new file mode 100644
index 0000000..fb7a4e1
--- /dev/null
+++ b/hunspell-1.2.1-1863239.badstructs.patch
@@ -0,0 +1,165 @@
+diff -ru hunspell-1.2.1.orig/src/hunspell/csutil.cxx hunspell-1.2.1/src/hunspell/csutil.cxx
+--- hunspell-1.2.1.orig/src/hunspell/csutil.cxx	2007-11-01 15:40:53.000000000 +0000
++++ hunspell-1.2.1/src/hunspell/csutil.cxx	2008-01-03 15:41:54.000000000 +0000
+@@ -941,7 +941,7 @@
+ { 0x00, 0xfc, 0xdc },
+ { 0x00, 0xfd, 0xdd },
+ { 0x00, 0xfe, 0xde },
+-{ 0x00, 0xff, 0xff },
++{ 0x00, 0xff, 0xff }
+ };
+ 
+ 
+@@ -1201,7 +1201,7 @@
+ { 0x00, 0xfc, 0xdc },
+ { 0x00, 0xfd, 0xdd },
+ { 0x00, 0xfe, 0xde },
+-{ 0x00, 0xff, 0xff },
++{ 0x00, 0xff, 0xff }
+ };
+ 
+ 
+@@ -1461,7 +1461,7 @@
+ { 0x00, 0xfc, 0xdc },
+ { 0x00, 0xfd, 0xdd },
+ { 0x00, 0xfe, 0xde },
+-{ 0x00, 0xff, 0xff },
++{ 0x00, 0xff, 0xff }
+ };
+ 
+ struct cs_info iso4_tbl[] = {
+@@ -1720,7 +1720,7 @@
+ { 0x00, 0xfc, 0xdc },
+ { 0x00, 0xfd, 0xdd },
+ { 0x00, 0xfe, 0xde },
+-{ 0x00, 0xff, 0xff },
++{ 0x00, 0xff, 0xff }
+ };
+ 
+ struct cs_info iso5_tbl[] = {
+@@ -1979,7 +1979,7 @@
+ { 0x00, 0xfc, 0xac },
+ { 0x00, 0xfd, 0xfd },
+ { 0x00, 0xfe, 0xae },
+-{ 0x00, 0xff, 0xaf },
++{ 0x00, 0xff, 0xaf }
+ };
+ 
+ struct cs_info iso6_tbl[] = {
+@@ -2238,7 +2238,7 @@
+ { 0x00, 0xfc, 0xfc },
+ { 0x00, 0xfd, 0xfd },
+ { 0x00, 0xfe, 0xfe },
+-{ 0x00, 0xff, 0xff },
++{ 0x00, 0xff, 0xff }
+ };
+ 
+ struct cs_info iso7_tbl[] = {
+@@ -2497,7 +2497,7 @@
+ { 0x00, 0xfc, 0xbc },
+ { 0x00, 0xfd, 0xbe },
+ { 0x00, 0xfe, 0xbf },
+-{ 0x00, 0xff, 0xff },
++{ 0x00, 0xff, 0xff }
+ };
+ 
+ struct cs_info iso8_tbl[] = {
+@@ -2756,7 +2756,7 @@
+ { 0x00, 0xfc, 0xfc },
+ { 0x00, 0xfd, 0xfd },
+ { 0x00, 0xfe, 0xfe },
+-{ 0x00, 0xff, 0xff },
++{ 0x00, 0xff, 0xff }
+ };
+ 
+ struct cs_info iso9_tbl[] = {
+@@ -3015,7 +3015,7 @@
+ { 0x00, 0xfc, 0xdc },
+ { 0x00, 0xfd, 0x49 },
+ { 0x00, 0xfe, 0xde },
+-{ 0x00, 0xff, 0xff },
++{ 0x00, 0xff, 0xff }
+ };
+ 
+ struct cs_info iso10_tbl[] = {
+@@ -3274,7 +3274,7 @@
+ { 0x00, 0xfc, 0xfc },
+ { 0x00, 0xfd, 0xfd },
+ { 0x00, 0xfe, 0xfe },
+-{ 0x00, 0xff, 0xff },
++{ 0x00, 0xff, 0xff }
+ };
+ 
+ struct cs_info koi8r_tbl[] = {
+@@ -3533,7 +3533,7 @@
+ { 0x01, 0xdc, 0xfc },
+ { 0x01, 0xdd, 0xfd },
+ { 0x01, 0xde, 0xfe },
+-{ 0x01, 0xdf, 0xff },
++{ 0x01, 0xdf, 0xff }
+ };
+ 
+ struct cs_info koi8u_tbl[] = {
+@@ -3792,7 +3792,7 @@
+ { 0x01, 0xdc, 0xfc },
+ { 0x01, 0xdd, 0xfd },
+ { 0x01, 0xde, 0xfe },
+-{ 0x01, 0xdf, 0xff },
++{ 0x01, 0xdf, 0xff }
+ };
+ 
+ struct cs_info cp1251_tbl[] = {
+@@ -4051,7 +4051,7 @@
+ { 0x00, 0xfc, 0xdc },
+ { 0x00, 0xfd, 0xdd },
+ { 0x00, 0xfe, 0xde },
+-{ 0x00, 0xff, 0xdf },
++{ 0x00, 0xff, 0xdf }
+ };
+ 
+ struct cs_info iso13_tbl[] = {
+@@ -4310,7 +4310,7 @@
+ { 0x00, 0xFC, 0xDC },
+ { 0x00, 0xFD, 0xDD },
+ { 0x00, 0xFE, 0xDE },
+-{ 0x00, 0xFF, 0xFF },
++{ 0x00, 0xFF, 0xFF }
+ };
+ 
+ 
+@@ -4570,7 +4570,7 @@
+ { 0x00, 0xfc, 0xdc },
+ { 0x00, 0xfd, 0xdd },
+ { 0x00, 0xfe, 0xde },
+-{ 0x00, 0xff, 0xff },
++{ 0x00, 0xff, 0xff }
+ };
+ 
+ struct cs_info iso15_tbl[] = {
+@@ -4829,7 +4829,7 @@
+ { 0x00, 0xfc, 0xdc },
+ { 0x00, 0xfd, 0xdd },
+ { 0x00, 0xfe, 0xde },
+-{ 0x00, 0xff, 0xbe },
++{ 0x00, 0xff, 0xbe }
+ };
+ 
+ struct cs_info iscii_devanagari_tbl[] = {
+@@ -5088,7 +5088,7 @@
+ { 0x00, 0xfc, 0xfc },
+ { 0x00, 0xfd, 0xfd },
+ { 0x00, 0xfe, 0xfe },
+-{ 0x00, 0xff, 0xff },
++{ 0x00, 0xff, 0xff }
+ };
+ 
+ struct enc_entry encds[] = {
+@@ -5108,7 +5108,7 @@
+ {"ISO8859-13", iso13_tbl},
+ {"ISO8859-14", iso14_tbl},
+ {"ISO8859-15", iso15_tbl},
+-{"ISCII-DEVANAGARI", iscii_devanagari_tbl},
++{"ISCII-DEVANAGARI", iscii_devanagari_tbl}
+ };
+ 
+ struct cs_info * get_current_cs(const char * es) {
diff --git a/hunspell.spec b/hunspell.spec
index 07a4c9a..5ee622e 100644
--- a/hunspell.spec
+++ b/hunspell.spec
@@ -1,7 +1,7 @@
 Name:      hunspell
 Summary:   Hunspell is a spell checker and morphological analyzer library
 Version:   1.2.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 Source:    http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz
 Group:     System Environment/Libraries
 URL:       http://hunspell.sourceforge.net/
@@ -10,6 +10,7 @@ License:   LGPLv2+ or GPLv2+ or MPLv1.1
 BuildRequires: libtool, ncurses-devel
 
 Patch1: hunspell-pkgconfig.patch
+Patch2: hunspell-1.2.1-1863239.badstructs.patch
 
 %description
 Hunspell is a spell checker and morphological analyzer library and program 
@@ -28,6 +29,7 @@ Includes and definitions for developing with hunspell
 %prep
 %setup -q
 %patch1 -p1 -b .pkgconfig.patch
+%patch2 -p1 -b .1863239.badstructs.patch
 
 %build
 libtoolize --automake --force
@@ -80,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/hunspell.pc
 
 %changelog
+* Thu Jan 03 2008 Caolan McNamara <caolanm@redhat.com> - 1.2.1-3
+- add hunspell-1.2.1-1863239.badstructs.patch
+
 * Fri Nov 09 2007 Caolan McNamara <caolanm@redhat.com> - 1.2.1-2
 - pkg-config cockup