diff --git a/import.log b/import.log index df80aba..ba94bbc 100644 --- a/import.log +++ b/import.log @@ -5,3 +5,4 @@ libchewing-0_3_2-1_fc10:HEAD:libchewing-0.3.2-1.fc10.src.rpm:1229994594 libchewing-0_3_2-2_fc10:HEAD:libchewing-0.3.2-2.fc10.src.rpm:1230010807 libchewing-0_3_2-3_fc10:HEAD:libchewing-0.3.2-3.fc10.src.rpm:1231914268 libchewing-0_3_2-4_fc10:HEAD:libchewing-0.3.2-4.fc10.src.rpm:1232696067 +libchewing-0_3_2-6_fc10:HEAD:libchewing-0.3.2-6.fc10.src.rpm:1235113283 diff --git a/libchewing-0.3.2.bz477690.patch b/libchewing-0.3.2.bz477690.patch index 81d72cb..d7881a8 100644 --- a/libchewing-0.3.2.bz477690.patch +++ b/libchewing-0.3.2.bz477690.patch @@ -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 13:54:17.000000000 +1000 ++++ ./data/Makefile.am 2009-02-20 12:23:46.000000000 +1000 @@ -9,8 +9,11 @@ datas = \ us_freq.dat \ dict.dat \ @@ -26,20 +26,18 @@ diff -up ./data/Makefile.am.libpatch ./data/Makefile.am +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 14:07:56.000000000 +1000 -@@ -3,7 +3,8 @@ INCLUDES = \ ++++ ./src/Makefile.am 2009-02-20 12:26:46.000000000 +1000 +@@ -3,6 +3,7 @@ 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\" + -DCHEWING_DATADIR=\"$(datadir)/chewing\" 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 14:04:36.000000000 +1000 ++++ ./src/tree.c 2009-02-20 12:23:46.000000000 +1000 @@ -114,7 +114,8 @@ void InitTree( const char *prefix ) int i; #endif diff --git a/libchewing.spec b/libchewing.spec index fecdd0b..5fd84ee 100644 --- a/libchewing.spec +++ b/libchewing.spec @@ -1,7 +1,7 @@ Name: libchewing Version: 0.3.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Intelligent phonetic input method library for Traditional Chinese Group: System Environment/Libraries @@ -24,6 +24,7 @@ Patch9: libchewing-0.3.2.bz477690.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: autoconf automake libtool +BuildRequires: python-devel %description libchewing is an intelligent phonetic input method library for Chinese. @@ -56,9 +57,12 @@ library. %patch9 -p0 -b .libpatch %build -autoreconf -v --install +#./autogen.sh +#autoreconf -v +export CFLAGS=-DLIBINSTDIR='\"%{_libdir}\"' %configure --disable-static -make LIBINSTDIR="\"%{_libdir}\"" +#make LIBINSTDIR="\"%{_libdir}\"" +make all RPM_CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -66,6 +70,8 @@ make DESTDIR=%{buildroot} install rm $RPM_BUILD_ROOT%{_libdir}/libchewing.la mkdir -p $RPM_BUILD_ROOT%{libchewing_python_dir} cp python/chewing.py $RPM_BUILD_ROOT%{libchewing_python_dir} +mkdir -p $RPM_BUILD_ROOT%{_libdir}/chewing +cp data/fonetree.dat $RPM_BUILD_ROOT%{_libdir}/chewing touch $RPM_BUILD_ROOT%{libchewing_python_dir}/__init__.py %post -p /sbin/ldconfig @@ -92,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog +* Fri Feb 20 2009 Ding-Yi Chen - 0.3.2-6 +- Fix [Bug 486409] - Wrong python binding installed path + Add BuildRequires: python-devel + * Wed Feb 18 2009 Adam Jackson 0.3.2-5 - Rerun autotools so changes to Makefile.am actually take effect.