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

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Apr 21 05:38:32 UTC 2005 

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

Modified Files:
	iiimf-le-chinput.spec 
Added Files:
	iiimf-le-chinput-0.3-namespace.patch 
Log Message:
fix namespace issue, bug 154787


iiimf-le-chinput-0.3-namespace.patch:
 src/chinput.c                            |    4 ++--
 src/xaux/Makefile.am                     |    4 ++--
 unicon/ImmModules/cce/Makefile.am        |    4 ++--
 unicon/ImmModules/cce/inputs/Makefile.am |    4 ++--
 unicon/ImmModules/turbo/Makefile.am      |    4 ++--
 unicon/Makefile.am                       |    2 +-
 unicon/server/Makefile.am                |    2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE iiimf-le-chinput-0.3-namespace.patch ---
diff -uNr iiimf-le-chinput-0.3/src/chinput.c iiimf-le-chinput-0.3.orig/src/chinput.c
--- iiimf-le-chinput-0.3/src/chinput.c	2005-04-21 14:32:59.972601080 +0800
+++ iiimf-le-chinput-0.3.orig/src/chinput.c	2005-04-21 14:24:53.652532968 +0800
@@ -382,9 +382,9 @@
     l->name_length = 8;
     l->domain = "com.redhat";
     l->scope = "chinput"; 
-    l->path = "./locale/zh_CN/chinput/aux.so";    
+    l->path = "./chinput/aux.so";    
                /* path for .so from /usr/lib/im/ */
-               /* this will be /usr/lib/im/locale/zh_CN/chinput/aux.so */
+               /* this will be /usr/lib/im/chinput/aux.so */
     l->signature = "";
     l->basepath = NULL;         /* only for CCDEF */
     l->encoding = NULL;         /* only for CCDEF */
diff -uNr iiimf-le-chinput-0.3/src/xaux/Makefile.am iiimf-le-chinput-0.3.orig/src/xaux/Makefile.am
--- iiimf-le-chinput-0.3/src/xaux/Makefile.am	2005-04-21 14:32:59.994597736 +0800
+++ iiimf-le-chinput-0.3.orig/src/xaux/Makefile.am	2005-04-21 14:26:37.299776192 +0800
@@ -1,5 +1,5 @@
-libdir = $(prefix)/locale/zh_CN/chinput
-bindir = $(prefix)/locale/zh_CN/chinput
+libdir = $(prefix)/chinput
+bindir = $(prefix)/chinput
 aux_la_CFLAGS = $(X_CFLAGS) $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
                 -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
                 -I../../include -I../../include/X11 \
diff -uNr iiimf-le-chinput-0.3/unicon/ImmModules/cce/inputs/Makefile.am iiimf-le-chinput-0.3.orig/unicon/ImmModules/cce/inputs/Makefile.am
--- iiimf-le-chinput-0.3/unicon/ImmModules/cce/inputs/Makefile.am	2004-08-06 15:22:51.000000000 +0800
+++ iiimf-le-chinput-0.3.orig/unicon/ImmModules/cce/inputs/Makefile.am	2005-04-21 14:28:15.447855416 +0800
@@ -1,6 +1,6 @@
 bin_PROGRAMS = cin2tab txt2tab txt2tab1 tab2txt tab2txt1
-datadir = $(prefix)/locale/zh_CN/chinput/cce
-bindir = $(prefix)/locale/zh_CN/chinput/bin
+datadir = $(prefix)/chinput/cce
+bindir = $(prefix)/chinput/bin
 INCLUDES = -I../
 
 data_DATA = pinyin.map sysphrase.tab usrphrase.tab \
diff -uNr iiimf-le-chinput-0.3/unicon/ImmModules/cce/Makefile.am iiimf-le-chinput-0.3.orig/unicon/ImmModules/cce/Makefile.am
--- iiimf-le-chinput-0.3/unicon/ImmModules/cce/Makefile.am	2004-08-06 15:11:58.000000000 +0800
+++ iiimf-le-chinput-0.3.orig/unicon/ImmModules/cce/Makefile.am	2005-04-21 14:27:58.109491248 +0800
@@ -3,8 +3,8 @@
 cin2tab_SOURCES = cin2tab.c
 INCLUDES = -I../../../include -I.
 
-datadir = $(prefix)/locale/zh_CN/chinput
-bindir = $(prefix)/locale/zh_CN/chinput/ccebin
+datadir = $(prefix)/chinput
+bindir = $(prefix)/chinput/ccebin
 
 cce_hzinput_la_CFLAGS = -I../../../include -I.
 cce_hzinput_la_LDFLAGS = -module -rpath $(datadir)
diff -uNr iiimf-le-chinput-0.3/unicon/ImmModules/turbo/Makefile.am iiimf-le-chinput-0.3.orig/unicon/ImmModules/turbo/Makefile.am
--- iiimf-le-chinput-0.3/unicon/ImmModules/turbo/Makefile.am	2004-08-07 07:33:42.000000000 +0800
+++ iiimf-le-chinput-0.3.orig/unicon/ImmModules/turbo/Makefile.am	2005-04-21 14:28:44.142493168 +0800
@@ -6,8 +6,8 @@
 levelphrase_SOURCES = levelphrase.c xl_mfile.c TL_hzinput.c \
                       xl_hzinput.c xl_phrase.c xl_sysphrase.c
 
-datadir = $(prefix)/locale/zh_CN/chinput
-bindir = $(prefix)/locale/zh_CN/chinput/bin
+datadir = $(prefix)/chinput
+bindir = $(prefix)/chinput/bin
 
 INCLUDES = -I../ -I../../../include
 
diff -uNr iiimf-le-chinput-0.3/unicon/Makefile.am iiimf-le-chinput-0.3.orig/unicon/Makefile.am
--- iiimf-le-chinput-0.3/unicon/Makefile.am	2004-08-06 15:37:35.000000000 +0800
+++ iiimf-le-chinput-0.3.orig/unicon/Makefile.am	2005-04-21 14:27:15.231009768 +0800
@@ -1,4 +1,4 @@
 SUBDIRS=server client ImmModules
 data_DATA = sys-big5.tab sys-gb.tab Chinput.ad
-datadir = $(prefix)/locale/zh_CN/chinput
+datadir = $(prefix)/chinput
 EXTRA_DIST = Chinput.ad sys-big5.tab sys-gb.tab
diff -uNr iiimf-le-chinput-0.3/unicon/server/Makefile.am iiimf-le-chinput-0.3.orig/unicon/server/Makefile.am
--- iiimf-le-chinput-0.3/unicon/server/Makefile.am	2004-08-06 16:27:39.000000000 +0800
+++ iiimf-le-chinput-0.3.orig/unicon/server/Makefile.am	2005-04-21 14:31:14.202680552 +0800
@@ -6,6 +6,6 @@
                      TLS_const.h TLS_HzConvertTable.h TLS_LibMain.hpp \
                      TLS_LibMain.loT TLS_MemBlock.hpp \
                      TLS_MemBlock.cpp
-libimm_server_la_CPPFLAGS = -I../../include -DUNICON_LIB=\"$(prefix)/locale/zh_CN/chinput\"
+libimm_server_la_CPPFLAGS = -I../../include -DUNICON_LIB=\"$(prefix)/chinput\"
 noinst_LTLIBRARIES = libimm_server.la
 


Index: iiimf-le-chinput.spec
===================================================================
RCS file: /cvs/dist/rpms/iiimf-le-chinput/devel/iiimf-le-chinput.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- iiimf-le-chinput.spec	8 Apr 2005 03:26:29 -0000	1.14
+++ iiimf-le-chinput.spec	21 Apr 2005 05:38:30 -0000	1.15
@@ -4,7 +4,7 @@
 Summary: A Simplified Chinese language engine for im-sdk
 Name: iiimf-le-chinput
 Version: 0.3
-Release: 18
+Release: 19
 License: Distributable
 Source: %{name}-%{version}.tar.bz2
 URL: http://people.redhat.com/yshao/im-sdk/
@@ -23,6 +23,7 @@
 Patch5: iiimf-le-chinput-switch_off_luc-ia64_prototype.patch
 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
 Requires: iiimf-server
 Requires(post): %{_bindir}/iiimf-le-tools, %{_bindir}/killall
 Requires(preun): %{_bindir}/iiimf-le-tools
@@ -48,6 +49,7 @@
 %patch5 -p1 -b .switch_off_luc-ia64_prototype
 %patch6 -p1 -b .6-checks
 %patch7 -p1 -b .7-path
+%patch8 -p1 -b .8-namespace
 
 %build
 # FIXME: IM_INIT config variables don't actually seem to be used (see patch7)
@@ -83,6 +85,9 @@
 %{im_dir}/*
 
 %changelog
+* Thu Apr 21 2005 Yu Shao <yshao at redhat.com> -19
+- move /locale/zh_CN/* to /chinput
+
 * Fri Apr  8 2005 Jens Petersen <petersen at redhat.com> - 0.3-18
 - update for new iiimf file-paths
   - add iiimf-le-chinput-0.3-LE-filepath.patch

More information about the fedora-cvs-commits mailing list