rpms/libchewing/F-13 libchewing-0.3.2.hsu.2.patch, NONE, 1.1 import.log, 1.19, 1.20 libchewing.spec, 1.42, 1.43
Ding-Yi Chen
dchen at fedoraproject.org
Thu Mar 4 07:42:02 UTC 2010
- Previous message: rpms/libchewing/devel import.log,1.20,1.21 libchewing.spec,1.43,1.44
- Next message: rpms/libchewing/F-12 libchewing-0.3.2.hsu.2.patch, NONE, 1.1 import.log, 1.19, 1.20 libchewing.spec, 1.42, 1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dchen
Update of /cvs/pkgs/rpms/libchewing/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25183/F-13
Modified Files:
import.log libchewing.spec
Added Files:
libchewing-0.3.2.hsu.2.patch
Log Message:
Fix the 4th tone in Dvorak Hsu
libchewing-0.3.2.hsu.2.patch:
zuin.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
--- NEW FILE libchewing-0.3.2.hsu.2.patch ---
diff -up ./src/zuin.c.hsu ./src/zuin.c
--- ./src/zuin.c.hsu 2008-12-02 00:29:20.000000000 +1000
+++ ./src/zuin.c 2010-03-04 16:43:23.000000000 +1000
@@ -183,11 +178,8 @@ static int HsuPhoInput( ZuinData *pZuin,
{
int type = 0, searchTimes = 0, inx = 0;
- if (
- ( IsHsuPhoEndKey( pZuin->pho_inx, key ) &&
- ( pZuin->kbtype == KB_HSU ) ) ||
- ( IsDvorakHsuPhoEndKey( pZuin->pho_inx, key ) &&
- ( pZuin->kbtype == KB_DVORAK_HSU ) ) ) {
+ /* Dvorak Hsu key has already converted to Hsu */
+ if ( IsHsuPhoEndKey( pZuin->pho_inx, key )){
if ( pZuin->pho_inx[ 1 ] == 0 && pZuin->pho_inx[ 2 ] == 0 ) {
/* convert "ㄐㄑㄒ" to "ㄓㄔㄕ" */
if ( 12 <= pZuin->pho_inx[ 0 ] && pZuin->pho_inx[ 0 ] <= 14 ) {
@@ -232,10 +224,7 @@ static int HsuPhoInput( ZuinData *pZuin,
pZuin->pho_inx[ 0 ] = 12;
}
- if ( pZuin->kbtype == KB_HSU )
- searchTimes = ( key == 'j' ) ? 3 : 2;
- else if ( pZuin->kbtype == KB_DVORAK_HSU )
- searchTimes = ( key == 'h' || key == 'n' ) ? 3 : 2 ;
+ searchTimes = ( key == 'j' ) ? 3 : 2;
return EndKeyProcess( pZuin, key, searchTimes );
}
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-13/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- import.log 10 Feb 2010 23:13:55 -0000 1.19
+++ import.log 4 Mar 2010 07:42:01 -0000 1.20
@@ -17,3 +17,4 @@ libchewing-0_3_2-16_fc11:HEAD:libchewing
libchewing-0_3_2-17_fc12:HEAD:libchewing-0.3.2-17.fc12.src.rpm:1262678096
libchewing-0_3_2-21_fc12:HEAD:libchewing-0.3.2-21.fc12.src.rpm:1265088570
libchewing-0_3_2-22_fc12:HEAD:libchewing-0.3.2-22.fc12.src.rpm:1265843616
+libchewing-0_3_2-26_fc12:F-13:libchewing-0.3.2-26.fc12.src.rpm:1267688498
Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-13/libchewing.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- libchewing.spec 10 Feb 2010 23:13:56 -0000 1.42
+++ libchewing.spec 4 Mar 2010 07:42:02 -0000 1.43
@@ -2,7 +2,7 @@
%define name_zh_TW %{im_name_zh_TW}函式庫
Name: libchewing
Version: 0.3.2
-Release: 22%{?dist}
+Release: 26%{?dist}
Summary: Intelligent phonetic input method library for Traditional Chinese
Summary(zh_TW): %{name_zh_TW}
@@ -23,6 +23,8 @@ Patch9: libchewing-0.3.2.bz477690.patch
Patch10: libchewing-0.3.2.phraseChoiceRearward.2.patch
Patch11: libchewing-0.3.2.chewing_zuin.patch
Patch12: libchewing-0.3.2.hsu.patch
+Patch13: libchewing-0.3.2.hsu.2.patch
+
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%define libchewing_python_dir %{python_sitearch}/%{name}
@@ -87,6 +89,7 @@ Python binding of libchewing.
%patch10 -p0 -b .phraseChoiceRearward
%patch11 -p0 -b .chewing_zuin
%patch12 -p0 -b .hsu
+%patch13 -p0 -b .hsu.2
%build
export CFLAGS=-DLIBINSTDIR='\"%{_libdir}\" -g'
@@ -95,13 +98,13 @@ autoreconf -ivf
%{__make} RPM_CFLAGS="%{optflags}" %{_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
%{__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
+%{__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
@@ -109,7 +112,7 @@ touch $RPM_BUILD_ROOT%{libchewing_python
%postun -p /sbin/ldconfig
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
@@ -132,6 +135,21 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Mar 04 2010 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-26
+- Fix Dvorak Hsu 4th tone key (ibus google issue 755 comment 12,
+ chewing google issue 10)
+- Resolves: #555192
+
+* Mon Feb 15 2010 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-24
+- Fix Hsu and Dvorak Hsu input (ibus google issue 755,
+ chewing google issue 10)
+- Resolves: #555192
+
+* Mon Feb 15 2010 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-23
+- Fix Hsu and Dvorak Hsu input (ibus google issue 755,
+ chewing google issue 10)
+- Resolves: #555192
+
* Wed Feb 10 2010 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-22
- Fix Hsu and Dvorak Hsu input (ibus google issue 755)
- Resolves: #555192
- Previous message: rpms/libchewing/devel import.log,1.20,1.21 libchewing.spec,1.43,1.44
- Next message: rpms/libchewing/F-12 libchewing-0.3.2.hsu.2.patch, NONE, 1.1 import.log, 1.19, 1.20 libchewing.spec, 1.42, 1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list