rpms/libchewing/F-10 import.log, 1.4, 1.5 libchewing-0.3.2.bz477690.patch, 1.1, 1.2 libchewing.spec, 1.24, 1.25

[Ding-Yi Chen]

Author: dchen

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

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


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	23 Dec 2008 01:11:47 -0000	1.4
+++ import.log	23 Dec 2008 05:43:13 -0000	1.5
@@ -2,3 +2,4 @@
 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
+libchewing-0_3_2-2_fc10:F-10:libchewing-0.3.2-2.fc10.src.rpm:1230010931

libchewing-0.3.2.bz477690.patch:

Index: libchewing-0.3.2.bz477690.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/libchewing-0.3.2.bz477690.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libchewing-0.3.2.bz477690.patch	23 Dec 2008 01:11:47 -0000	1.1
+++ libchewing-0.3.2.bz477690.patch	23 Dec 2008 05:43:13 -0000	1.2
@@ -1,6 +1,6 @@
 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
++++ ./data/Makefile.am	2008-12-23 13:54:17.000000000 +1000
 @@ -9,8 +9,11 @@ datas = \
  	us_freq.dat \
  	dict.dat \
@@ -26,22 +26,27 @@
 +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 = \
++++ ./src/Makefile.am	2008-12-23 14:07:56.000000000 +1000
+@@ -3,7 +3,8 @@ INCLUDES = \
  	-I$(top_srcdir)/include \
+ 	-I$(top_srcdir)/include/internal \
+ 	-I$(top_srcdir)/src/porting_layer/include \
+-	-DCHEWING_DATADIR=\"$(datadir)/chewing\"
++	-DLIBINSTDIR=\"$(libdir)\"\
++	-DCHEWING_DATADIR=\"$(datadir)/chewing1\"
+ 
+ lib_LTLIBRARIES = libchewing.la
+ libchewing_la_SOURCES = \
 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 )
++++ ./src/tree.c	2008-12-23 14:04:36.000000000 +1000
+@@ -114,7 +114,8 @@ 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 );
++	sprintf( filename, "%s" PLAT_SEPARATOR "chewing" PLAT_SEPARATOR "%s", 
++	LIBINSTDIR, 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: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/libchewing.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libchewing.spec	23 Dec 2008 01:11:47 -0000	1.24
+++ libchewing.spec	23 Dec 2008 05:43:13 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           libchewing
 Version:        0.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -19,6 +19,7 @@
 Patch9: libchewing-0.3.2.bz477690.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  libtool
 
 %description
 libchewing is an intelligent phonetic input method library for Chinese.
@@ -52,7 +53,7 @@
 
 %build
 %configure --disable-static
-make
+make LIBINSTDIR="\"%{_libdir}\""
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -83,7 +84,7 @@
 %{_libdir}/*.so
 
 %changelog
-* Tue Dec 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-1
+* Tue Dec 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-2
 - [Bug 477690] libchewing multilib conflict
   Move /usr/share/chewing/fonetree.dat to corresponding libdir.