[alexandria/f17] Fix crash on ja_JP.utf8 (and perhaps on other multibyte locales)

Mamoru Tasaka mtasaka at fedoraproject.org
Sat Apr 7 20:03:50 UTC 2012


commit 410a7b85fdb08d4919d83a556a209bfa3e887dc8
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Apr 8 05:03:36 2012 +0900

    Fix crash on ja_JP.utf8 (and perhaps on other multibyte locales)

 alexandria-0.6.8-kcodefix.patch |    6 ++++--
 alexandria.spec                 |    7 ++++++-
 clog                            |    3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/alexandria-0.6.8-kcodefix.patch b/alexandria-0.6.8-kcodefix.patch
index da16b0c..5408a91 100644
--- a/alexandria-0.6.8-kcodefix.patch
+++ b/alexandria-0.6.8-kcodefix.patch
@@ -1,12 +1,14 @@
 diff -up alexandria-0.6.8/bin/alexandria.kcodefix alexandria-0.6.8/bin/alexandria
 --- alexandria-0.6.8/bin/alexandria.kcodefix	2012-03-23 14:39:42.898463507 -0400
-+++ alexandria-0.6.8/bin/alexandria	2012-03-23 14:42:24.785019154 -0400
-@@ -1,6 +1,7 @@
++++ alexandria-0.6.8/bin/alexandria	2012-04-08 04:40:00.000000000 +0900
+@@ -1,6 +1,9 @@
  #!/usr/bin/env ruby
 +# encoding: utf-8
  
 -$KCODE = 'U'
 +$KCODE = 'U' unless RUBY_VERSION > "1.9.0"
++# Japanese locale see some odd failure without below...
++ENV["LANG"] = ENV["LANG"].sub("utf8", "utf-8")
  
  require 'rubygems'
  begin
diff --git a/alexandria.spec b/alexandria.spec
index e727afb..7e904e1 100644
--- a/alexandria.spec
+++ b/alexandria.spec
@@ -5,7 +5,7 @@
 %undefine		minorver	
 %undefine		ifpre	
 
-%define		fedorarel	3
+%define		fedorarel	4
 %define		rel		%{?ifpre:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -45,6 +45,8 @@ Patch13:	alexandria-0.6.8-rdoc.patch
 # Force encoding type to make rake happy
 Patch14:	alexandria-0.6.8-ascii-fix.patch
 # Fix kcode issues with 1.9
+# Well, with the original fix, some strange failure on startup
+# happens on ja_JP.utf8...
 Patch15:	alexandria-0.6.8-kcodefix.patch
 # eval fix
 Patch16:	alexandria-0.6.8-evalfix.patch
@@ -208,6 +210,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Sun Apr  8 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.6.8-4
+- Fix crash on ja_JP.utf8 (and perhaps on other multibyte locales) 
+
 * Fri Mar 23 2012 Tom Callaway <spot at fedoraproject.org> - 0.6.8-3
 - get working again
 
diff --git a/clog b/clog
index 34a30c6..a56b3ab 100644
--- a/clog
+++ b/clog
@@ -1 +1,2 @@
-Require rubygem(gstreamer) & remove no longer needed patch
+Fix crash on ja_JP.utf8 (and perhaps on other multibyte locales) 
+


More information about the scm-commits mailing list