rpms/ibus-hangul/F-10 ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch, NONE, 1.1 ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 ibus-hangul.spec, 1.3, 1.4 sources, 1.4, 1.5

[Huang Peng]

Author: phuang

Update of /cvs/pkgs/rpms/ibus-hangul/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13306

Modified Files:
	.cvsignore ibus-hangul.spec sources 
Added Files:
	ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch 
	ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch 
Log Message:
Port F-11 beanch to F-10

ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch:

--- NEW FILE ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch ---
diff -urN ibus-hangul-1.1.0.20090328.orig/src/engine.c ibus-hangul-1.1.0.20090328/src/engine.c
--- ibus-hangul-1.1.0.20090328.orig/src/engine.c	2009-04-06 16:21:46.663081165 -0400
+++ ibus-hangul-1.1.0.20090328/src/engine.c	2009-04-06 16:50:00.163321101 -0400
@@ -384,19 +384,19 @@
 
 	ibus_hangul_engine_commit_current_candidate (hangul);
         ibus_hangul_engine_close_lookup_table (hangul);
-    } else if (keyval == IBUS_Left) {
+    } else if (keyval == IBUS_Up) {
         ibus_lookup_table_cursor_up (hangul->table);
         ibus_hangul_engine_update_lookup_table (hangul);
         ibus_hangul_engine_update_auxiliary_text (hangul);
-    } else if (keyval == IBUS_Right) {
+    } else if (keyval == IBUS_Down) {
         ibus_lookup_table_cursor_down (hangul->table);
         ibus_hangul_engine_update_lookup_table (hangul);
         ibus_hangul_engine_update_auxiliary_text (hangul);
-    } else if (keyval == IBUS_Up) {
+    } else if (keyval == IBUS_Left) {
         ibus_lookup_table_page_up (hangul->table);
         ibus_hangul_engine_update_lookup_table (hangul);
         ibus_hangul_engine_update_auxiliary_text (hangul);
-    } else if (keyval == IBUS_Down) {
+    } else if (keyval == IBUS_Right) {
         ibus_lookup_table_page_down (hangul->table);
         ibus_hangul_engine_update_lookup_table (hangul);
         ibus_hangul_engine_update_auxiliary_text (hangul);

ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch:

--- NEW FILE ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch ---
diff -urN ibus-hangul-1.1.0.20090328.orig/src/engine.c ibus-hangul-1.1.0.20090328/src/engine.c
--- ibus-hangul-1.1.0.20090328.orig/src/engine.c	2009-03-26 01:50:18.000000000 -0400
+++ ibus-hangul-1.1.0.20090328/src/engine.c	2009-04-06 16:20:44.935321507 -0400
@@ -450,7 +450,7 @@
     if (keyval == IBUS_Shift_L || keyval == IBUS_Shift_R)
         return FALSE;
 
-    if (keyval == IBUS_F9 || keyval == IBUS_Hangul_Hanja) {
+    if (keyval == IBUS_F9 || keyval == IBUS_Hangul_Hanja || keyval == IBUS_Control_R) {
 	ibus_hangul_engine_toggle_lookup_table (hangul);
 	return TRUE;
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Oct 2008 06:53:39 -0000	1.4
+++ .cvsignore	27 Apr 2009 00:43:03 -0000	1.5
@@ -1 +1 @@
-ibus-hangul-0.1.1.20081023.tar.gz
+ibus-hangul-1.1.0.20090328.tar.gz


Index: ibus-hangul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/F-10/ibus-hangul.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ibus-hangul.spec	23 Oct 2008 06:53:39 -0000	1.3
+++ ibus-hangul.spec	27 Apr 2009 00:43:03 -0000	1.4
@@ -1,22 +1,21 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define mod_path ibus-0.1
 Name:       ibus-hangul
-Version:    0.1.1.20081023
-Release:    1%{?dist}
+Version:    1.1.0.20090328
+Release:    2%{?dist}
 Summary:    The Hangul engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0:     ibus-hangul-1.1.0.20090328-right-ctrl-hanja.patch
+Patch1:     ibus-hangul-1.1.0.20090328-hanja-arrow-keys.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext-devel
 BuildRequires:  libtool
-BuildRequires:  python-devel
 BuildRequires:  libhangul-devel
-BuildRequires:  swig
 BuildRequires:  pkgconfig
+BuildRequires:  ibus-devel
 
 Requires:   ibus
 
@@ -26,6 +25,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -35,7 +36,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} install
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/_hangul.la
 
 %find_lang %{name}
 
@@ -45,15 +45,35 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-# %dir %{python_sitearch}/ibus
-%{python_sitearch}/hangul.py*
-%{python_sitearch}/_hangul.so
-%dir %{_datadir}/ibus-hangul
-%{_bindir}/ibus-engine-hangul
-%{_datadir}/ibus-hangul/*
-%{_datadir}/ibus/engine/hangul.engine
+%{_libexecdir}/ibus-engine-hangul
+%{_libexecdir}/ibus-setup-hangul
+%{_datadir}/ibus-hangul
+%{_datadir}/ibus/component/*
 
 %changelog
+* Sun Apr 12 2009 Warren Togami <wtogami at redhat.com> - 1.1.0.20090330-2
+- Bug 493706: ibus-hangul Hanja arrow keys are wrong
+- Bug 493509: ibus-hangul missing right Ctrl for Hanja button
+  These fixes are not ideal, but they make it usable for Fedora 11.
+  These must become configurable in a future version.
+
+* Mon Mar 30 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090330-1
+- Update version to 1.1.0.20090330.
+- Fix bug 486056 - missing options for 2bul, 3bul and other Korean layouts
+- Fix bug 487269 - missing Hanja Conversion
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0.20090211-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 11 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090211-1
+- Update version to 1.1.0.20090211.
+
+* Thu Feb 05 2009 Huang Peng <shawn.p.huang at gmail.com> - 1.1.0.20090205-1
+- Update version to 1.1.0.20090205.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.1.20081023-2
+- Rebuild for Python 2.6
+
 * Thu Oct 23 2008 Huang Peng <shawn.p.huang at gmail.com> - 0.1.1.20081023-1
 - Update to 0.1.1.20081023.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-hangul/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Oct 2008 06:53:39 -0000	1.4
+++ sources	27 Apr 2009 00:43:03 -0000	1.5
@@ -1 +1 @@
-8ff5552dddfdd58085596ad874a1e39d  ibus-hangul-0.1.1.20081023.tar.gz
+4b7e737fce25202b6338794988f53a18  ibus-hangul-1.1.0.20090328.tar.gz