From 4663cc48d23c9ddd102d580dff49ec31f3b077a9 Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Jul 09 2009 08:13:52 +0000 Subject: fix up warnings --- diff --git a/hunspell-1.2.8-2784983.defaultlanguage.patch b/hunspell-1.2.8-2784983.defaultlanguage.patch index 08e42af..1ff91e0 100644 --- a/hunspell-1.2.8-2784983.defaultlanguage.patch +++ b/hunspell-1.2.8-2784983.defaultlanguage.patch @@ -9,7 +9,7 @@ diff -ru hunspell-1.2.8.orig/man/hunspell.1 hunspell-1.2.8/man/hunspell.1 -Without locale support, the default personal dictionary is -the $HOME/.hunspell_default. +The default dictionary depends on the locale settings. The -+following environment variables are searched: LANGUAGE, LC_ALL, ++following environment variables are searched: LC_ALL, +LC_MESSAGES, and LANG. If none are set then the default personal +dictionary is $HOME/.hunspell_default. @@ -20,7 +20,7 @@ diff -ru hunspell-1.2.8.orig/man/hunspell.1 hunspell-1.2.8/man/hunspell.1 .I \-p. .SH FILES +The default dictionary depends on the locale settings. The -+following environment variables are searched: LANGUAGE, LC_ALL, ++following environment variables are searched: LC_ALL, +LC_MESSAGES, and LANG. If none are set then the following +fallbacks are used: + @@ -59,10 +59,10 @@ diff -ru hunspell-1.2.8.orig/src/tools/hunspell.cxx hunspell-1.2.8/src/tools/hun - if (at) *at = '\0'; - } else { + /* -+ * Search in order of LANGUAGE, LC_ALL, LC_MESSAGES & ++ * Search in order of LC_ALL, LC_MESSAGES & + * LANG + */ -+ const char *tests[] = { "LANGUAGE", "LC_ALL", "LC_MESSAGES", "LANG" }; ++ const char *tests[] = { "LC_ALL", "LC_MESSAGES", "LANG" }; + for (size_t i = 0; i < sizeof(tests) / sizeof(const char*); ++i) { + if ((dicname=getenv(tests[i])) && strcmp(dicname, "") != 0) { + dicname = mystrdup(dicname); diff --git a/hunspell.spec b/hunspell.spec index eb80773..2c54e1a 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -1,7 +1,7 @@ Name: hunspell Summary: A spell checker and morphological analyzer library Version: 1.2.8 -Release: 8%{?dist} +Release: 9%{?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 @@ -111,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/hunspell.3.gz %changelog +* Thu Jul 09 2009 Caolan McNamara - 1.2.8-9 +- fix up rpmlint warnings + * Tue Jul 07 2009 Caolan McNamara - 1.2.8-8 - Resolves: rhbz#509882 ignore an empty LANGUAGE variable