[migemo] Fix crash on migemo-dict.rb with actual use (bug 830559)

[Mamoru Tasaka]

commit c766af8d6a46a5fb54c0f68f46047db375049fb9
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Mon Jun 11 23:33:35 2012 +0900

    Fix crash on migemo-dict.rb with actual use (bug 830559)

 migemo-0.40-bz830559.patch |   11 +++++++++++
 migemo.spec                |    8 +++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/migemo-0.40-bz830559.patch b/migemo-0.40-bz830559.patch
new file mode 100644
index 0000000..144c829
--- /dev/null
+++ b/migemo-0.40-bz830559.patch
@@ -0,0 +1,11 @@
+--- migemo-0.40/migemo-dict.rb.bz830559	2012-06-11 23:17:27.000000000 +0900
++++ migemo-0.40/migemo-dict.rb	2012-06-11 23:18:06.000000000 +0900
+@@ -39,7 +39,7 @@
+ 
+   private
+   def decompose (line)
+-    array = line.chomp.split("\t").delete_if do |x| x == nil end
++    array = line.chomp.force_encoding("EUC-JP").split("\t").delete_if do |x| x == nil end
+     key = array.shift
+     values = array
+     raise if key == nil
diff --git a/migemo.spec b/migemo.spec
index 88a3e37..12ab4c1 100644
--- a/migemo.spec
+++ b/migemo.spec
@@ -8,7 +8,7 @@
 
 Name:		migemo
 Version:	%{migemover}
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary:	Japanese incremental search tool
 Group:		Applications/Text
 License:	GPLv2
@@ -16,6 +16,8 @@ URL:		http://0xcc.net/migemo/
 Source0:	http://0xcc.net/migemo/%{name}-%{version}.tar.gz
 # patch taken and modified from http://d.hatena.ne.jp/yshl/20090814/1250197679
 Patch0:		migemo-ruby-1.9.patch
+# See bug 830559
+Patch1:		migemo-0.40-bz830559.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -59,6 +61,7 @@ Requires:	apel
 %setup -q
 %patch0 -p1
 sed -i '18d' migemo-convert.rb # patching is failing probably because of the special chars, so do this by sed
+%patch1 -p1
 
 %build
 %configure \
@@ -105,6 +108,9 @@ done
 %{xe_sitedir}/migemo.el*
 
 %changelog
+* Mon Jun 11 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.40-16
+- Fix crash on migemo-dict.rb with actual use (bug 830559)
+
 * Fri Mar 02 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 0.40-15
 - Rebuilt and patched for Ruby 1.9.3.