rpms/iiimf-le-chinput/devel iiimf-le-chinput-0.3-namespace-location.patch, NONE, 1.1 iiimf-le-chinput.spec, 1.15, 1.16

[fedora-cvs-commits at redhat.com]

Author: yshao

Update of /cvs/dist/rpms/iiimf-le-chinput/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7235

Modified Files:
	iiimf-le-chinput.spec 
Added Files:
	iiimf-le-chinput-0.3-namespace-location.patch 
Log Message:
fix for Bug 157619 – GBK pinyin and Shuang Pin input style crash iiimd


iiimf-le-chinput-0.3-namespace-location.patch:
 Makefile.am |    7 ++++++-
 config.h    |    4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE iiimf-le-chinput-0.3-namespace-location.patch ---
diff -uNr iiimf-le-chinput-0.3.orig/unicon/ImmModules/turbo/config.h iiimf-le-chinput-0.3/unicon/ImmModules/turbo/config.h
--- iiimf-le-chinput-0.3.orig/unicon/ImmModules/turbo/config.h	2004-08-04 20:10:28.000000000 +0800
+++ iiimf-le-chinput-0.3/unicon/ImmModules/turbo/config.h	2005-05-31 19:53:36.477948248 +0800
@@ -1,5 +1,5 @@
 #ifndef CONFIG_H
 #define CONFIG_H
-#define SYSPHRASEFILE_GB    "/usr/lib/Chinput/im/tl_sysphrase.gb.bin"
-#define SYSPHRASEFILE_BIG5  "/usr/lib/Chinput/im/tl_sysphrase.big5.bin"
+#define SYSPHRASEFILE_GB    CHINPUT_BASEDIR"/tl_sysphrase.gb.bin"
+#define SYSPHRASEFILE_BIG5  CHINPUT_BASEDIR"/tl_sysphrase.big5.bin"
 #endif
diff -uNr iiimf-le-chinput-0.3.orig/unicon/ImmModules/turbo/Makefile.am iiimf-le-chinput-0.3/unicon/ImmModules/turbo/Makefile.am
--- iiimf-le-chinput-0.3.orig/unicon/ImmModules/turbo/Makefile.am	2005-05-31 17:33:56.000000000 +0800
+++ iiimf-le-chinput-0.3/unicon/ImmModules/turbo/Makefile.am	2005-05-31 19:55:05.246453384 +0800
@@ -1,17 +1,22 @@
 bin_PROGRAMS = cin2tab addphrase levelphrase
 cin2tab_SOURCES = cin2tab.c xl_mfile.c TL_hzinput.c xl_hzinput.c \
                   xl_phrase.c xl_sysphrase.c
+cin2tab_CFLAGS = -DCHINPUT_BASEDIR=\"$(BASEDIR)\"
 addphrase_SOURCES = addphrase.c xl_mfile.c TL_hzinput.c \
                     xl_hzinput.c xl_phrase.c xl_sysphrase.c
+addphrase_CFLAGS = -DCHINPUT_BASEDIR=\"$(BASEDIR)\"
 levelphrase_SOURCES = levelphrase.c xl_mfile.c TL_hzinput.c \
                       xl_hzinput.c xl_phrase.c xl_sysphrase.c
+levelphrase_CFLAGS = -DCHINPUT_BASEDIR=\"$(BASEDIR)\"
 
 datadir = $(prefix)/chinput
 bindir = $(prefix)/chinput/bin
+BASEDIR = $(prefix)/chinput
 
 INCLUDES = -I../ -I../../../include
 
-TL_hzinput_la_CFLAGS = -DUNICON_LIB=\"$(datadir)\" -I../../../include -I.
+TL_hzinput_la_CFLAGS = -DCHINPUT_BASEDIR=\"$(BASEDIR)\" \
+                       -DUNICON_LIB=\"$(datadir)\" -I../../../include -I.
 TL_hzinput_la_SOURCES =	xl_mfile.c TL_hzinput.c xl_hzinput.c \
                         xl_phrase.c xl_sysphrase.c
 TL_hzinput_la_LDFLAGS = -module -rpath $(datadir)


Index: iiimf-le-chinput.spec
===================================================================
RCS file: /cvs/dist/rpms/iiimf-le-chinput/devel/iiimf-le-chinput.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- iiimf-le-chinput.spec	21 Apr 2005 05:38:30 -0000	1.15
+++ iiimf-le-chinput.spec	31 May 2005 10:44:41 -0000	1.16
@@ -4,7 +4,7 @@
 Summary: A Simplified Chinese language engine for im-sdk
 Name: iiimf-le-chinput
 Version: 0.3
-Release: 19
+Release: 20
 License: Distributable
 Source: %{name}-%{version}.tar.bz2
 URL: http://people.redhat.com/yshao/im-sdk/
@@ -24,6 +24,7 @@
 Patch6: iiimf-le-chinput-0.3-cfg-chks.patch
 Patch7: iiimf-le-chinput-0.3-LE-filepath.patch
 Patch8: iiimf-le-chinput-0.3-namespace.patch
+Patch9: iiimf-le-chinput-0.3-namespace-location.patch
 Requires: iiimf-server
 Requires(post): %{_bindir}/iiimf-le-tools, %{_bindir}/killall
 Requires(preun): %{_bindir}/iiimf-le-tools
@@ -50,6 +51,7 @@
 %patch6 -p1 -b .6-checks
 %patch7 -p1 -b .7-path
 %patch8 -p1 -b .8-namespace
+%patch9 -p1 -b .9-location
 
 %build
 # FIXME: IM_INIT config variables don't actually seem to be used (see patch7)
@@ -85,6 +87,9 @@
 %{im_dir}/*
 
 %changelog
+* Tue May 31 2005 Yu Shao <yshao at redhat.com> -20
+- fix for Bug 157619 – GBK pinyin and Shuang Pin input style crash iiimd
+
 * Thu Apr 21 2005 Yu Shao <yshao at redhat.com> -19
 - move /locale/zh_CN/* to /chinput