rpms/libchewing/devel import.log, 1.7, 1.8 libchewing-0.3.2.bz477690.patch, 1.2, 1.3 libchewing.spec, 1.28, 1.29
Ding-Yi Chen
dchen at fedoraproject.org
Fri Feb 20 07:02:28 UTC 2009
- Previous message: rpms/perl-Text-Table/F-10 perl-Text-Table.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/perl-Text-Table/F-9 perl-Text-Table.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dchen
Update of /cvs/pkgs/rpms/libchewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12241/devel
Modified Files:
import.log libchewing-0.3.2.bz477690.patch libchewing.spec
Log Message:
[Bug 486409] Wrong python binding installed path
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log 23 Jan 2009 07:35:06 -0000 1.7
+++ import.log 20 Feb 2009 07:01:57 -0000 1.8
@@ -5,3 +5,4 @@
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
libchewing-0.3.2.bz477690.patch:
Index: libchewing-0.3.2.bz477690.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/libchewing-0.3.2.bz477690.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libchewing-0.3.2.bz477690.patch 23 Dec 2008 05:41:25 -0000 1.2
+++ libchewing-0.3.2.bz477690.patch 20 Feb 2009 07:01:57 -0000 1.3
@@ -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 @@
+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
Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/libchewing.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libchewing.spec 18 Feb 2009 22:19:51 -0000 1.28
+++ libchewing.spec 20 Feb 2009 07:01:57 -0000 1.29
@@ -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 @@
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 @@
%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 @@
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 @@
%{_libdir}/*.so
%changelog
+* Fri Feb 20 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-6
+- Fix [Bug 486409] - Wrong python binding installed path
+ Add BuildRequires: python-devel
+
* Wed Feb 18 2009 Adam Jackson <ajax at redhat.com> 0.3.2-5
- Rerun autotools so changes to Makefile.am actually take effect.
- Previous message: rpms/perl-Text-Table/F-10 perl-Text-Table.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/perl-Text-Table/F-9 perl-Text-Table.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list