From 2482d2461be9dc478949752b15026c72f02f580d Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 3 Dec 2012 18:23:15 +1000 Subject: [PATCH] Fixed IBus Google issue 1126 --- .gitignore | 1 + ibus-table-chinese.spec | 30 ++++++++++++++++++++---------- sources | 2 +- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 565d22d..d8a9042 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /ibus-table-chinese-1.4.2-Source.tar.gz /ibus-table-chinese-1.4.4-Source.tar.gz /ibus-table-chinese-1.4.5-Source.tar.gz +/ibus-table-chinese-1.4.6-Source.tar.gz diff --git a/ibus-table-chinese.spec b/ibus-table-chinese.spec index 9dbe2e2..88a0854 100644 --- a/ibus-table-chinese.spec +++ b/ibus-table-chinese.spec @@ -3,7 +3,7 @@ %global ibus_icons_dir %{_datadir}/ibus-table/icons %global createdb ibus-table-createdb Name: ibus-table-chinese -Version: 1.4.5 +Version: 1.4.6 Release: 1%{?dist} Summary: Chinese input tables for IBus Summary(zh_CN): 中文码表输入法 @@ -79,6 +79,7 @@ Cangjie3, Canjie5, and Cangjie big tables. Summary: Cantonese input methods Summary(zh_TW): 粵語輸入法 Group: System Environment/Libraries +License: GPLv2, GPLv3+ and Freely redistributable without restriction Requires: %{name} = %{version}-%{release} Provides: ibus-table-cantonese = %{version}-%{release} Obsoletes: ibus-table-cantonese < 1.3 @@ -98,6 +99,7 @@ Summary: Easy input method Summary(zh_CN): 轻松输入法 Summary(zh_TW): 輕鬆輸入法 Group: System Environment/Libraries +License: GPLv2 Requires: %{name} = %{version}-%{release} Provides: ibus-table-easy = %{version}-%{release} Obsoletes: ibus-table-easy < 1.3 @@ -116,7 +118,7 @@ Summary: Erbi input method Summary(zh_CN): 二笔输入法 Summary(zh_TW): 二筆輸入法 Group: System Environment/Libraries -License: Freely redistributable without restriction +License: GPLv2+ Requires: %{name} = %{version}-%{release} Provides: ibus-table-erbi = %{version}-%{release} Obsoletes: ibus-table-erbi < 1.3 @@ -128,12 +130,12 @@ and Erbi Qin-Song (erbi-qs) %description -l zh_CN erbi 包含: -超強二笔 (erbi) +小林子二笔 (erbi) 以及青松二笔 (erbi-qs) %description -l zh_TW erbi 包含: -超強二筆 (erbi) +小林子二筆 (erbi) 以及青松二筆 (erbi-qs) @@ -168,6 +170,7 @@ Summary: Smart Cangjie Summary(zh_CN): 快速仓颉输入法 Summary(zh_TW): 快速倉頡輸入法 Group: System Environment/Libraries +License: GPLv3+ Requires: %{name} = %{version}-%{release} Provides: ibus-table-cangjie = %{version}-%{release} Obsoletes: ibus-table-cangjie < 1.3 @@ -205,6 +208,7 @@ Summary: Stroke 5 input method Summary(zh_CN): 笔顺五码输入法 Summary(zh_TW): 筆順五碼輸入法 Group: System Environment/Libraries +License: GPLv3+ Requires: %{name} = %{version}-%{release} Provides: ibus-table-stroke5 = %{version}-%{release} Obsoletes: ibus-table-stroke5 < 1.3 @@ -223,6 +227,7 @@ Summary: Wu pronunciation input method Summary(zh_CN): 上海吳语注音输入法 Summary(zh_TW): 上海吳語注音輸入法 Group: System Environment/Libraries +License: GPLv2+ Requires: %{name} = %{version}-%{release} Provides: ibus-table-wu = %{version}-%{release} Obsoletes: ibus-table-wu < 1.3 @@ -262,9 +267,9 @@ Haifeng Wubi 86. %package wubi-jidian -Summary: Jidian Wubi input method -Summary(zh_CN): 极点五笔输入法 -Summary(zh_TW): 極點五筆輸入法 +Summary: Jidian Wubi 86 input method, JiShuang 6.0 +Summary(zh_CN): 极点五笔86输入法 极爽词库 6.0 +Summary(zh_TW): 極點五筆86輸入法 極爽詞庫 6.0 Group: System Environment/Libraries License: Freely redistributable without restriction Requires: %{name} = %{version}-%{release} @@ -276,10 +281,10 @@ Jidian Wubi input methods. Current includes: Wubi 86. %description -l zh_CN wubi-jidian -极点五笔输入法。包含:极点五笔86。 +使用极爽字库之极点五笔输入法。 %description -l zh_TW wubi-jidian -極點五筆輸入法。包含:五筆86。 +使用極爽字庫極點五筆輸入法 %package yong @@ -287,6 +292,7 @@ Summary: YongMa input method Summary(zh_CN): 永码输入法 Summary(zh_TW): 永碼輸入法 Group: System Environment/Libraries +License: GPLv3 Requires: %{name} = %{version}-%{release} Provides: ibus-table-yong = %{version}-%{release} Obsoletes: ibus-table-yong < 1.3 @@ -312,7 +318,7 @@ YongMa input method. %install %__make install DESTDIR=$RPM_BUILD_ROOT # We install document using %doc -(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-table-chinese-1.4.5 +(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-table-chinese-1.4.6 rm -rf AUTHORS README ChangeLog COPYING README ) @@ -433,6 +439,10 @@ YongMa input method. %changelog +* Mon Dec 03 2012 Ding-Yi Chen - 1.4.6-1 +- Fixed IBus Google issue 1126: An error in ChineseTableLicenseAuditing +- Complete LICENSE tag for all of the tables. + * Mon Nov 26 2012 Ding-Yi Chen - 1.4.5-1 - Table build scripts has been refactored. - cmake-fedora is added as submodule. diff --git a/sources b/sources index 6671c8b..c343b95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1dd234b1cc891d43fb9f63e657c4ee81 ibus-table-chinese-1.4.5-Source.tar.gz +552dc3e28fbbf52435d3ce41fc09ac35 ibus-table-chinese-1.4.6-Source.tar.gz