rpms/childsplay/F-11 childsplay-1.4-lang_switch.patch, NONE, 1.1 childsplay.spec, 1.20, 1.21

[Johan Cwiklinski]

Author: trasher

Update of /cvs/extras/rpms/childsplay/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29635

Modified Files:
	childsplay.spec 
Added Files:
	childsplay-1.4-lang_switch.patch 
Log Message:
Fix bug #530599

childsplay-1.4-lang_switch.patch:
 utils.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE childsplay-1.4-lang_switch.patch ---
diff -up childsplay-1.4/utils.py.patch childsplay-1.4/utils.py
--- childsplay-1.4/utils.py.patch	2009-10-23 19:55:08.000000000 +0200
+++ childsplay-1.4/utils.py	2009-10-23 19:56:40.000000000 +0200
@@ -114,7 +114,7 @@ def get_locale():
         if lang == '':
             lang = locale.getdefaultlocale()[0].split('_')[0]
     except Exception, info:
-        module_logger.error("%s, %s" % info, "Switching to English")
+        module_logger.error("%s, %s" % (info, "Switching to English"))
         lang = 'en'
     if lang == 'C' or lang.lower() == 'posix':
         # Default to English


Index: childsplay.spec
===================================================================
RCS file: /cvs/extras/rpms/childsplay/F-11/childsplay.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- childsplay.spec	13 Sep 2009 11:53:00 -0000	1.20
+++ childsplay.spec	23 Oct 2009 19:19:01 -0000	1.21
@@ -3,7 +3,7 @@
 
 Name:           childsplay
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Suite of educational games for young children
 Group:          Amusements/Games
 License:        GPLv3
@@ -27,6 +27,7 @@ Source22:       alphabet_sounds_ro-%{alp
 Source23:       alphabet_sounds_ru-%{alphabet_ver}.tgz
 Source24:       alphabet_sounds_sl-%{alphabet_ver}.tgz
 Source25:       alphabet_sounds_sv-%{alphabet_ver}.tgz
+Patch0:         childsplay-1.4-lang_switch.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -200,6 +201,7 @@ pushd  alphabet_sounds_lt-%{alphabet_ver
 mkdir lt
 mv *.* lt
 popd
+%patch0 -p1
 
 
 %build
@@ -402,6 +404,9 @@ fi
 
 
 %changelog
+* Fri Oct 23 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4-2
+- fix get_locale issue (bug #530599)
+
 * Sun Sep 13 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 1.4-1
 - 1.4