From 7d7f6c677ea105f712d0de7edd3c0af98c562cd0 Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Tue, 15 Apr 2008 18:19:33 +0000 Subject: [PATCH] next version --- .cvsignore | 2 +- hunspell-1.2.1-1863239.badstructs.patch | 173 ------------------------ hunspell.spec | 12 +- sources | 2 +- 4 files changed, 10 insertions(+), 179 deletions(-) delete mode 100644 hunspell-1.2.1-1863239.badstructs.patch diff --git a/.cvsignore b/.cvsignore index c250a7a..79cc950 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -hunspell-1.2.1.tar.gz ispellaff2myspell +hunspell-1.2.2.tar.gz diff --git a/hunspell-1.2.1-1863239.badstructs.patch b/hunspell-1.2.1-1863239.badstructs.patch deleted file mode 100644 index 6454ca8..0000000 --- a/hunspell-1.2.1-1863239.badstructs.patch +++ /dev/null @@ -1,173 +0,0 @@ -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 16:02:31.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) { -@@ -5117,6 +5117,7 @@ - for (int i = 0; i < n; i++) { - if (strcmp(es,encds[i].enc_name) == 0) { - ccs = encds[i].cs_table; -+ break; - } - } - return ccs; diff --git a/hunspell.spec b/hunspell.spec index 0a0848e..a12d879 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: 6%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Source0: http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz Source1: http://people.debian.org/~agmartin/misc/ispellaff2myspell Group: System Environment/Libraries @@ -11,7 +11,6 @@ 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 @@ -30,7 +29,6 @@ Includes and definitions for developing with hunspell %prep %setup -q %patch1 -p1 -b .pkgconfig.patch -%patch2 -p1 -b .1863239.badstructs.patch # Filter unwanted Requires for the use explicitely string in ispellaff2myspell cat << \EOF > %{name}-req #!/bin/sh @@ -90,10 +88,16 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/unmunch %{_bindir}/analyze %{_bindir}/chmorph +%{_bindir}/hzip +%{_bindir}/hunzip %{_bindir}/ispellaff2myspell %{_libdir}/pkgconfig/hunspell.pc %changelog +* Tue Apr 15 2008 Caolan McNamara - 1.2.2-1 +- latest version +- drop integrated hunspell-1.2.1-1863239.badstructs.patch + * Wed Mar 05 2008 Caolan McNamara - 1.2.1-6 - add ispellaff2myspell to devel diff --git a/sources b/sources index 2f6cd3b..3c5681e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c504f9c2065f697e586593992dd74dae hunspell-1.2.1.tar.gz 1c5ea5ecd2481ddc116d65ea294acae3 ispellaff2myspell +e8cde1130894dcd3f732248db945d0c0 hunspell-1.2.2.tar.gz