rpms/hunspell/F-11 hunspell-1.2.8-2784983.defaultlanguage.patch, 1.2, 1.3 hunspell.spec, 1.61, 1.62

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18846/F-11

Modified Files:
	hunspell-1.2.8-2784983.defaultlanguage.patch hunspell.spec 
Log Message:
Resolves: rhbz#509882 ignore an empty LANGUAGE variable

hunspell-1.2.8-2784983.defaultlanguage.patch:

Index: hunspell-1.2.8-2784983.defaultlanguage.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/F-11/hunspell-1.2.8-2784983.defaultlanguage.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- hunspell-1.2.8-2784983.defaultlanguage.patch	26 Jun 2009 14:56:24 -0000	1.2
+++ hunspell-1.2.8-2784983.defaultlanguage.patch	7 Jul 2009 14:04:27 -0000	1.3
@@ -47,7 +47,7 @@ diff -ru hunspell-1.2.8.orig/src/tools/h
  	textdomain("hunspell");
          ui_enc = nl_langinfo(CODESET);
  #endif
-@@ -1515,13 +1514,26 @@
+@@ -1557,13 +1556,26 @@
  	
  	if (! dicname) {
  		if (! (dicname=getenv("DICTIONARY"))) {
@@ -63,8 +63,8 @@ diff -ru hunspell-1.2.8.orig/src/tools/h
 +			 * LANG
 +			*/
 +			const char *tests[] = { "LANGUAGE", "LC_ALL", "LC_MESSAGES", "LANG" };
-+			for (int i = 0; i < sizeof(tests) / sizeof(const char*); ++i) {
-+				if ((dicname=getenv(tests[i]))) {
++			for (size_t i = 0; i < sizeof(tests) / sizeof(const char*); ++i) {
++				if ((dicname=getenv(tests[i])) && strcmp(dicname, "") != 0) {
 +					dicname = mystrdup(dicname);
 +					char * dot = strchr(dicname, '.');
 +					if (dot) *dot = '\0';
@@ -81,7 +81,7 @@ diff -ru hunspell-1.2.8.orig/src/tools/h
  		            dicname=mystrdup(DEFAULTDICNAME);
  			}
  		} else {
-@@ -1535,6 +1544,12 @@
+@@ -1577,6 +1589,12 @@
  	path = add(add(add(add(path, HOME), DIRSEP), USEROOODIR), PATHSEP);
  	path = add(path, OOODIR);
  
@@ -94,7 +94,7 @@ diff -ru hunspell-1.2.8.orig/src/tools/h
  	if (!privdicname) privdicname = mystrdup(getenv("WORDLIST"));
  
          int diclen = strlen(dicname);
-@@ -1544,9 +1559,6 @@
+@@ -1586,9 +1604,6 @@
  	char * dic = search(path, dicname, ".dic");
  	if (aff && dic) {
  		if (showpath) {
@@ -104,7 +104,7 @@ diff -ru hunspell-1.2.8.orig/src/tools/h
  			fprintf(stderr, gettext("LOADED DICTIONARY:\n%s\n%s\n"), aff, dic);
  		}
  		pMS[0] = new Hunspell(aff, dic, key);
-@@ -1569,7 +1581,7 @@
+@@ -1611,7 +1626,7 @@
                      } else if (dic) pMS[dmax-1]->add_dic(dic);
  		}
  	} else {


Index: hunspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/F-11/hunspell.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- hunspell.spec	26 Jun 2009 14:56:24 -0000	1.61
+++ hunspell.spec	7 Jul 2009 14:04:27 -0000	1.62
@@ -1,7 +1,7 @@
 Name:      hunspell
 Summary:   A spell checker and morphological analyzer library
 Version:   1.2.8
-Release:   5%{?dist}
+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
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/hunspell.3.gz
 
 %changelog
+* Tue Jul 07 2009 Caolan McNamara <caolanm at redhat.com> - 1.2.8-6
+- Resolves: rhbz#509882 ignore an empty LANGUAGE variable
+
 * Fri Jun 26 2009 Caolan McNamara <caolanm at redhat.com> - 1.2.8-5
 - Resolves: rhbz#498556 fix default language detection