rpms/hunspell/F-10 hunspell-1.2.7-2314461.ispell-alike.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 hunspell.spec, 1.55, 1.56 sources, 1.26, 1.27
Caolan McNamara
caolanm at fedoraproject.org
Wed Nov 19 09:45:43 UTC 2008
- Previous message: rpms/xorg-x11-drv-nouveau/F-10 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xorg-x11-drv-nouveau.spec, 1.5, 1.6
- Next message: rpms/hunspell/devel hunspell-1.2.7-2314461.ispell-alike.patch, NONE, 1.1 hunspell.spec, 1.55, 1.56
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/hunspell/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6734
Modified Files:
.cvsignore hunspell.spec sources
Added Files:
hunspell-1.2.7-2314461.ispell-alike.patch
Log Message:
Resolves: rhbz#471085 ignore -m in ispell compatible mode (-a)
hunspell-1.2.7-2314461.ispell-alike.patch:
--- NEW FILE hunspell-1.2.7-2314461.ispell-alike.patch ---
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)) {
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 2 Nov 2008 14:36:29 -0000 1.24
+++ .cvsignore 19 Nov 2008 09:45:12 -0000 1.25
@@ -1,4 +1,3 @@
ispellaff2myspell
wordlist2hunspell
hunspell-1.2.7.tar.gz
-hunspell-1.2.8.tar.gz
Index: hunspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/F-10/hunspell.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- hunspell.spec 2 Nov 2008 14:36:29 -0000 1.55
+++ hunspell.spec 19 Nov 2008 09:45:12 -0000 1.56
@@ -1,7 +1,7 @@
Name: hunspell
Summary: Hunspell is a spell checker and morphological analyzer library
-Version: 1.2.8
-Release: 1%{?dist}
+Version: 1.2.7
+Release: 6%{?dist}
Source0: http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz
Source1: http://people.debian.org/~agmartin/misc/ispellaff2myspell
Source2: http://people.redhat.com/caolanm/hunspell/wordlist2hunspell
@@ -10,6 +10,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+ or GPLv2+ or MPLv1.1
BuildRequires: libtool, ncurses-devel
+Patch1: hunspell-1.2.7-2314461.ispell-alike.patch
%description
Hunspell is a spell checker and morphological analyzer library and program
@@ -27,6 +28,7 @@
%prep
%setup -q
+%patch1 -p1 -b .ispell-alike.patch
# Filter unwanted Requires for the "use explicitely" string in ispellaff2myspell
cat << \EOF > %{name}-req
#!/bin/sh
@@ -60,7 +62,6 @@
mv $RPM_BUILD_ROOT/%{_includedir}/*munch* $RPM_BUILD_ROOT/%{_includedir}/%{name}
install -m 755 src/tools/affixcompress $RPM_BUILD_ROOT/%{_bindir}/affixcompress
install -m 755 src/tools/makealias $RPM_BUILD_ROOT/%{_bindir}/makealias
-install -m 755 src/tools/wordforms $RPM_BUILD_ROOT/%{_bindir}/wordforms
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/ispellaff2myspell
install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/wordlist2hunspell
@@ -96,15 +97,15 @@
%{_bindir}/hunzip
%{_bindir}/ispellaff2myspell
%{_bindir}/wordlist2hunspell
-%{_bindir}/wordforms
%{_libdir}/pkgconfig/hunspell.pc
%{_mandir}/man1/hunzip.1.gz
%{_mandir}/man1/hzip.1.gz
%{_mandir}/man3/hunspell.3.gz
%changelog
-* Sun Nov 02 2008 Caolan McNamara <caolanm at redhat.com> - 1.2.8-1
-- latest version
+* Wed Nov 19 2008 Caolan McNamara <caolanm at redhat.com> - 1.2.7-6
+- Resolves: rhbz#471085 in ispell compatible mode (-a), ignore
+ -m option which means something different to ispell
* Sat Oct 18 2008 Caolan McNamara <caolanm at redhat.com> - 1.2.7-5
- sort as per "C" locale
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources 2 Nov 2008 14:36:29 -0000 1.26
+++ sources 19 Nov 2008 09:45:12 -0000 1.27
@@ -1,3 +1,3 @@
1c5ea5ecd2481ddc116d65ea294acae3 ispellaff2myspell
+9a4f345c3cfaeb8e6306285488a3127a hunspell-1.2.7.tar.gz
c3843ceb656d9732f674b66fd15d134c wordlist2hunspell
-1177af54a09e320d2c24015f29c3a93e hunspell-1.2.8.tar.gz
- Previous message: rpms/xorg-x11-drv-nouveau/F-10 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xorg-x11-drv-nouveau.spec, 1.5, 1.6
- Next message: rpms/hunspell/devel hunspell-1.2.7-2314461.ispell-alike.patch, NONE, 1.1 hunspell.spec, 1.55, 1.56
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list