rpms/libchewing/F-10 libchewing-0.3.2.bz477690.patch, NONE, 1.1 import.log, 1.3, 1.4 libchewing.spec, 1.23, 1.24

[Ding-Yi Chen]

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14413/F-10

Modified Files:
	import.log libchewing.spec 
Added Files:
	libchewing-0.3.2.bz477690.patch 
Log Message:
[BugFix 477690]

libchewing-0.3.2.bz477690.patch:

--- NEW FILE libchewing-0.3.2.bz477690.patch ---
diff -up ./data/Makefile.am.libpatch ./data/Makefile.am
--- ./data/Makefile.am.libpatch	2008-12-02 00:29:20.000000000 +1000
+++ ./data/Makefile.am	2008-12-23 10:58:42.000000000 +1000
@@ -9,8 +9,11 @@ datas = \
 	us_freq.dat \
 	dict.dat \
 	ph_index.dat \
-	fonetree.dat \
 	$(chindexs)
+
+datas_lib = \
+	fonetree.dat
+
 generated_header = $(top_builddir)/src/chewing-definition.h
 
 all: checkdata_stamp gendata_stamp
@@ -37,4 +40,8 @@ install-data-local: $(datas) pinyin.tab 
 	$(mkinstalldirs) $(DESTDIR)/$(datadir)/chewing
 	$(INSTALL_DATA) $(datas) pinyin.tab swkb.dat symbols.dat \
 		$(DESTDIR)/$(datadir)/chewing
-CLEANFILES = $(datas) gendata_stamp checkdata_stamp $(generated_header)
+	$(mkinstalldirs) $(DESTDIR)/$(libdir)/chewing
+	$(INSTALL_DATA) $(datas_lib) \
+	    $(DESTDIR)/$(libdir)/chewing
+
+CLEANFILES = $(datas) $(datas_lib) gendata_stamp checkdata_stamp $(generated_header)
diff -up ./src/Makefile.am.libpatch ./src/Makefile.am
--- ./src/Makefile.am.libpatch	2008-12-02 00:29:20.000000000 +1000
+++ ./src/Makefile.am	2008-12-23 10:58:42.000000000 +1000
@@ -1,3 +1,5 @@
+AM_CPPFLAGS = ${CFLAGS} -DLIBDIR=\"${libdir}\"
+
 SUBDIRS = porting_layer
 INCLUDES = \
 	-I$(top_srcdir)/include \
diff -up ./src/tree.c.libpatch ./src/tree.c
--- ./src/tree.c.libpatch	2008-12-02 00:29:20.000000000 +1000
+++ ./src/tree.c	2008-12-23 11:01:03.000000000 +1000
@@ -114,7 +114,7 @@ void InitTree( const char *prefix )
 	int i;
 #endif
 
-	sprintf( filename, "%s" PLAT_SEPARATOR "%s", prefix, PHONE_TREE_FILE );
+	sprintf( filename, "%s" PLAT_SEPARATOR "chewing" PLAT_SEPARATOR "%s", LIBDIR, PHONE_TREE_FILE );
 #ifdef USE_BINARY_DATA
 	plat_mmap_set_invalid( &tree_mmap );
 	tree_size = plat_mmap_create( &tree_mmap, filename, FLAG_ATTRIBUTE_READ );


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Dec 2008 05:48:47 -0000	1.3
+++ import.log	23 Dec 2008 01:11:47 -0000	1.4
@@ -1,3 +1,4 @@
 libchewing-0_3_0_901-0_fc9:HEAD:libchewing-0.3.0.901-0.fc9.src.rpm:1221612386
 libchewing-0_3_1-0_fc9:HEAD:libchewing-0.3.1-0.fc9.src.rpm:1223448249
 libchewing-0_3_2-0_fc9:F-10:libchewing-0.3.2-0.fc9.src.rpm:1228283261
+libchewing-0_3_2-1_fc10:F-10:libchewing-0.3.2-1.fc10.src.rpm:1229994672


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/libchewing.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libchewing.spec	3 Dec 2008 05:48:47 -0000	1.23
+++ libchewing.spec	23 Dec 2008 01:11:47 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           libchewing
 Version:        0.3.2
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -16,6 +16,7 @@
 #Patch6: libchewing-0.3.0-8.bz237916.patch
 #Patch7: libchewing-0.3.0-9.bz200694.patch
 #Patch8: libchewing-0.3.0-11.bz195416.patch
+Patch9: libchewing-0.3.2.bz477690.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
@@ -47,6 +48,7 @@
 #%patch6 -p1 -b .7-bz237916
 #%patch7 -p1 -b .8-bz200694
 #%patch8 -p1 -b .9-bz195416
+%patch9 -p0 -b .libpatch
 
 %build
 %configure --disable-static
@@ -70,7 +72,8 @@
 %doc README AUTHORS COPYING
 %dir %{_datadir}/chewing
 %{_datadir}/chewing/*
-%attr(755, root, root) %{_libdir}/*.so.*
+%{_libdir}/*.so.*
+%{_libdir}/chewing
 
 %files devel
 %defattr(-, root, root)
@@ -80,6 +83,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Dec 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-1
+- [Bug 477690] libchewing multilib conflict
+  Move /usr/share/chewing/fonetree.dat to corresponding libdir.
+		 
 * Wed Dec 03 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-0
 - Upstream update to 0.3.2.