Update to 1.3.3-6.

This commit is contained in:
Daiki Ueno 2011-11-18 16:18:01 +09:00
parent afc7d4fdb4
commit 54363628e3
3 changed files with 61 additions and 3 deletions

View File

@ -0,0 +1,52 @@
From 4a2f3279fb4fbeb8be66ff7bf40cce57e616d45b Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Tue, 25 Oct 2011 14:26:41 +0900
Subject: [PATCH] Blacklist some engines useless under ibus environment.
---
src/default.xml.in.in | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
Index: ibus-m17n-1.3.3/src/default.xml.in.in
===================================================================
--- ibus-m17n-1.3.3.orig/src/default.xml.in.in
+++ ibus-m17n-1.3.3/src/default.xml.in.in
@@ -14,6 +14,38 @@
@IBUS_HOTKEYS_XML@
<virtual-keyboard>us</virtual-keyboard>
</engine>
+ <!-- Blacklist some engines -->
+ <!-- kbd engines are duplicate of xkb engines -->
+ <engine>
+ <name>m17n:*:kbd</name>
+ <rank>-1</rank>
+ </engine>
+ <!-- zh:pinyin is considered as a toy, since it does not
+ support Han characters -->
+ <engine>
+ <name>m17n:zh:pinyin</name>
+ <rank>-1</rank>
+ </engine>
+ <!-- zh:py is superseded by ibus-pinyin etc -->
+ <engine>
+ <name>m17n:zh:py</name>
+ <rank>-1</rank>
+ </engine>
+ <!-- ja:anthy is superseded by ibus-anthy -->
+ <engine>
+ <name>m17n:ja:anthy</name>
+ <rank>-1</rank>
+ </engine>
+ <!-- ko:han2 is superseded by ibus-hangul -->
+ <engine>
+ <name>m17n:ko:han2</name>
+ <rank>-1</rank>
+ </engine>
+ <!-- ko:romaja is superseded by ibus-hangul -->
+ <engine>
+ <name>m17n:ko:romaja</name>
+ <rank>-1</rank>
+ </engine>
<!-- Indic engines should be selected by default:
https://bugzilla.redhat.com/show_bug.cgi?id=640896 -->
<engine>

View File

@ -29,8 +29,8 @@ index 927d382..23102c4 100644
AC_CONFIG_FILES([ po/Makefile.in AC_CONFIG_FILES([ po/Makefile.in
diff --git a/m4/.gitignore b/m4/.gitignore diff --git a/m4/.gitignore b/m4/.gitignore
index 0f4126c..e28d185 100644 index 0f4126c..e28d185 100644
--- a/m4/.gitignore #--- a/m4/.gitignore
+++ b/m4/.gitignore #+++ b/m4/.gitignore
@@ -1 +1,3 @@ @@ -1 +1,3 @@
*.m4 *.m4
+!ibus.m4 +!ibus.m4

View File

@ -23,7 +23,7 @@
Name: ibus-m17n Name: ibus-m17n
Version: 1.3.3 Version: 1.3.3
Release: 5%{?dist} Release: 6%{?dist}
Summary: The M17N engine for IBus platform Summary: The M17N engine for IBus platform
License: GPLv2+ License: GPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
@ -38,6 +38,7 @@ Patch4: ibus-m17n-xx-icon-symbol.patch
Patch5: ibus-m17n-virtkbd.patch Patch5: ibus-m17n-virtkbd.patch
Patch6: ibus-m17n-iok.patch Patch6: ibus-m17n-iok.patch
Patch7: ibus-m17n-hide-title-status.patch Patch7: ibus-m17n-hide-title-status.patch
Patch8: ibus-m17n-blacklist-engines.patch
# The following BR is for autogen and not necessary when packging # The following BR is for autogen and not necessary when packging
# released tarballs. # released tarballs.
@ -76,6 +77,7 @@ sed -i 's!^[-+][-+][-+] .*/m4/\.gitignore!#\0!' %PATCH4
%patch5 -p1 -b .virtkbd %patch5 -p1 -b .virtkbd
%patch6 -p1 -b .iok %patch6 -p1 -b .iok
%patch7 -p1 -b .hide-title-status %patch7 -p1 -b .hide-title-status
%patch8 -p1 -b .blacklist-engines
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
%build %build
@ -97,6 +99,10 @@ make DESTDIR=${RPM_BUILD_ROOT} install
%{_datadir}/ibus/component/* %{_datadir}/ibus/component/*
%changelog %changelog
* Fri Nov 18 2011 Daiki Ueno <dueno@redhat.com> - 1.3.3-6
- Add ibus-m17n-blacklist-engines.patch
https://lists.fedoraproject.org/pipermail/i18n/2011-October/001194.html
* Thu Sep 29 2011 Daiki Ueno <dueno@redhat.com> - 1.3.3-5 * Thu Sep 29 2011 Daiki Ueno <dueno@redhat.com> - 1.3.3-5
- Add ibus-m17n-hide-title-status.patch. - Add ibus-m17n-hide-title-status.patch.
- Fix bug 741157 - ibus-m17n: m17n "title" variable appears as a - Fix bug 741157 - ibus-m17n: m17n "title" variable appears as a