rpms/kdelibs/F-7 kdelibs-3.5.6-lang.patch, NONE, 1.1 kdelibs.spec, 1.211, 1.212

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdelibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17711

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.6-lang.patch 
Log Message:
apply patch to fix locale issue


kdelibs-3.5.6-lang.patch:

--- NEW FILE kdelibs-3.5.6-lang.patch ---
--- kdelibs-3.5.6/kdecore/klocale.cpp.orig	2007-05-22 17:49:31.000000000 +0200
+++ kdelibs-3.5.6/kdecore/klocale.cpp	2007-05-23 20:37:54.000000000 +0200
@@ -140,9 +140,11 @@ void KLocale::initLanguageList(KConfig *
   KConfigGroupSaver saver(config, "Locale");
 
   m_country = config->readEntry( "Country" );
-  if ( m_country.isEmpty() )
-    m_country = defaultCountry();
-
+  if ( m_country.isEmpty() ) {
+    QString ln, ct, chrset;
+    splitLocale(QString(::getenv("LANG")), ln, ct, chrset);
+    m_country = (ct.isEmpty()) ? defaultCountry() : ct.lower();
+  }
   // Reset the list and add the new languages
   QStringList languageList;
   if ( useEnv )


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-7/kdelibs.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- kdelibs.spec	23 May 2007 22:29:14 -0000	1.211
+++ kdelibs.spec	24 May 2007 15:59:50 -0000	1.212
@@ -51,6 +51,7 @@
 Patch40: kdelibs-3.5.4-kdeprint-utf8.patch
 Patch41: kdelibs-3.5.6-utempter.patch
 Patch42: kdelibs-3.5.7-ICEauthority.patch
+Patch43: kdelibs-3.5.6-lang.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch104: kdelibs-3.5.5-kstandarddirs.patch
@@ -191,6 +192,7 @@
 %patch40 -p1 -b .kdeprint-utf8
 %patch41 -p1 -b .utempter
 %patch42 -p1 -b .ICEauthority
+%patch43 -p1 -b .lang
 
 %patch104 -p1 -b .kstandarddirs
 
@@ -463,6 +465,7 @@
 %changelog
 * Thu May 24 2007 Than Ngo <than at redhat.com> 3.5.6-10.fc7
 - don't change permission .ICEauthority by sudo KDE programs
+- apply patch to fix locale issue
 
 * Thu May 16 2007 Rex Dieter <rdieter[AT]fedorproject.org> - 6:3.5.6-9
 - make qtdocdir handling robust