[libchewing/f14/master] Resolves: #625980

[Ding-Yi Chen]

commit 2939778b96ba8436f63900c3d9a6bd2aacea8dd4
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Fri Sep 3 06:22:13 2010 +1000

    Resolves: #625980

 .gitignore                   |    1 +
 libchewing-0.3.2.align.patch |   11 +++++++++++
 libchewing.spec              |   12 ++++++++----
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 898ce0f..a205990 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libchewing-0.3.2.tar.bz2
+/libchewing-0.3.2.tar.bz2
diff --git a/libchewing-0.3.2.align.patch b/libchewing-0.3.2.align.patch
new file mode 100644
index 0000000..ba10008
--- /dev/null
+++ b/libchewing-0.3.2.align.patch
@@ -0,0 +1,11 @@
+diff -up ./include/internal/chewing-private.h.align ./include/internal/chewing-private.h
+--- ./include/internal/chewing-private.h.align	2008-12-02 00:29:20.000000000 +1000
++++ ./include/internal/chewing-private.h	2010-09-02 17:14:12.565544961 +1000
+@@ -37,6 +37,7 @@
+ typedef union {
+ 	unsigned char s[ MAX_UTF8_SIZE + 1];
+ 	wchar_t wch;
++	unsigned char padding[8]; /* Ensure this structure is aligned */
+ } wch_t;
+ 
+ typedef struct {
diff --git a/libchewing.spec b/libchewing.spec
index abd5113..f0a4df3 100644
--- a/libchewing.spec
+++ b/libchewing.spec
@@ -2,7 +2,7 @@
 %define name_zh_TW %{im_name_zh_TW}函式庫
 Name:           libchewing
 Version:        0.3.2
-Release:        27%{?dist}
+Release:        28%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 Summary(zh_TW): %{name_zh_TW}
 
@@ -24,6 +24,8 @@ Patch10: libchewing-0.3.2.phraseChoiceRearward.2.patch
 Patch11: libchewing-0.3.2.chewing_zuin.patch
 Patch12: libchewing-0.3.2.hsu.patch
 Patch13: libchewing-0.3.2.hsu.2.patch
+# Rhbz#625980
+Patch14: libchewing-0.3.2.align.patch
 
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -90,6 +92,7 @@ Python binding of libchewing.
 %patch11 -p0 -b .chewing_zuin
 %patch12 -p0 -b .hsu
 %patch13 -p0 -b .hsu.2
+%patch14 -p0 -b .align
 
 %build
 export CFLAGS=-DLIBINSTDIR='\"%{_libdir}\" -g'
@@ -135,10 +138,11 @@ touch $RPM_BUILD_ROOT%{libchewing_python_dir}/__init__.py
 
 
 %changelog
-* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.3.2-27
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+* Thu Sep 02 2010 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-28
+- Resolves: #625980
+  Add padding to wch_t to ensure it's word aligned.
 
-* Wed Mar 04 2010 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-26
+* Wed Mar 04 2010 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-27
 - Fix Dvorak Hsu 4th tone key (ibus google issue 755 comment 12, 
   chewing google issue 10)
 - Resolves: #555192