rpms/hunspell/F-11 hunspell-1.2.8-2784983.defaultlanguage.patch, 1.1, 1.2 hunspell.spec, 1.60, 1.61

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	hunspell-1.2.8-2784983.defaultlanguage.patch hunspell.spec 
Log Message:
default to something sensible in C locale

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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hunspell-1.2.8-2784983.defaultlanguage.patch	1 May 2009 12:14:09 -0000	1.1
+++ hunspell-1.2.8-2784983.defaultlanguage.patch	26 Jun 2009 14:56:24 -0000	1.2
@@ -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,23 @@
+@@ -1515,13 +1514,26 @@
  	
  	if (! dicname) {
  		if (! (dicname=getenv("DICTIONARY"))) {
@@ -64,7 +64,7 @@ diff -ru hunspell-1.2.8.orig/src/tools/h
 +			*/
 +			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])) {
++				if ((dicname=getenv(tests[i]))) {
 +					dicname = mystrdup(dicname);
 +					char * dot = strchr(dicname, '.');
 +					if (dot) *dot = '\0';
@@ -74,6 +74,9 @@ diff -ru hunspell-1.2.8.orig/src/tools/h
 +				}
 +			}
 +
++			if (strcmp(dicname, "C") == 0)
++			    dicname=mystrdup("en_US");
++
 +			if (! dicname) {
  		            dicname=mystrdup(DEFAULTDICNAME);
  			}
@@ -84,7 +87,7 @@ diff -ru hunspell-1.2.8.orig/src/tools/h
  
 +	if (showpath) {
 +		fprintf(stderr, gettext("SEARCH PATH:\n%s\n"), path);
-+		fprintf(stderr, gettext("AVAILABLE DICTIONARIES (path is not mandatory for -d option):\n"), path);
++		fprintf(stderr, gettext("AVAILABLE DICTIONARIES (path is not mandatory for -d option):\n"));
 +		search(path, NULL, NULL);
 +	}
 +


Index: hunspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell/F-11/hunspell.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- hunspell.spec	1 May 2009 12:14:09 -0000	1.60
+++ hunspell.spec	26 Jun 2009 14:56:24 -0000	1.61
@@ -107,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/hunspell.3.gz
 
 %changelog
-* Fri May 01 2009 Caolan McNamara <caolanm at redhat.com> - 1.2.8-5
+* Fri Jun 26 2009 Caolan McNamara <caolanm at redhat.com> - 1.2.8-5
 - Resolves: rhbz#498556 fix default language detection
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8-4