- updated to 1.4.2

- removed obsolete 696864-abrt-ibus-1.4
- pl

diff --git a/ibus-chewing-696864-abrt-ibus-1.4.patch b/ibus-chewing-696864-abrt-ibus-1.4.patch
deleted file mode 100644 (file)
index fc2be85..0000000
--- a/ibus-chewing-696864-abrt-ibus-1.4.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From ff138d7a18b7577e5f04f852bd3caf87cbc9e7cc Mon Sep 17 00:00:00 2001
-From: Ding-Yi Chen <dingyichen@gmail.com>
-Date: Thu, 20 Jan 2011 17:03:07 +1000
-Subject: [PATCH] Addressed comments of yusake
-
----
- src/IBusChewingEngine-def.c |   30 ++++++++++++++++++++++--------
- 1 files changed, 22 insertions(+), 8 deletions(-)
-
-diff --git a/src/IBusChewingEngine-def.c b/src/IBusChewingEngine-def.c
-index 90c0384..8c90766 100644
---- a/src/IBusChewingEngine-def.c
-+++ b/src/IBusChewingEngine-def.c
-@@ -391,21 +391,29 @@ this option determines how these status be synchronized. Valid values:\n\
- void g_variant_to_g_value(GVariant *gVar, GValue *gValue){
-     const GVariantType *gVType=g_variant_get_type(gVar);
-     if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_BOOLEAN)){
-+      g_value_init(gValue, G_TYPE_BOOLEAN);
-       g_value_set_boolean(gValue, g_variant_get_boolean(gVar));
-     }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT16)){
-+      g_value_init(gValue, G_TYPE_UINT);
-       g_value_set_uint(gValue, g_variant_get_uint16(gVar));
-     }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT32)){
-+      g_value_init(gValue, G_TYPE_UINT);
-       g_value_set_uint(gValue, g_variant_get_uint32(gVar));
-     }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_UINT64)){
-+      g_value_init(gValue, G_TYPE_UINT64);
-       g_value_set_uint64(gValue, g_variant_get_uint64(gVar));
-     }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT16)){
-+      g_value_init(gValue, G_TYPE_INT);
-       g_value_set_int(gValue, g_variant_get_int16(gVar));
-     }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT32)){
-+      g_value_init(gValue, G_TYPE_INT);
-       g_value_set_int(gValue, g_variant_get_int32(gVar));
-     }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_INT64)){
-+      g_value_init(gValue, G_TYPE_INT);
-       g_value_set_int64(gValue, g_variant_get_int64(gVar));
-     }else if (g_variant_type_is_subtype_of(gVType, G_VARIANT_TYPE_STRING)){
--      g_value_set_int64(gValue, g_variant_get_string(gVar, NULL));
-+      g_value_init(gValue, G_TYPE_STRING);
-+      g_value_set_string(gValue, g_variant_get_string(gVar, NULL));
-     }
- }
- 
-@@ -419,8 +427,14 @@ GVariant *g_value_to_g_variant(GValue *gValue){
-       case G_TYPE_UINT:
-           gVar=g_variant_new_uint32(g_value_get_uint(gValue));
-           break;
-+      case G_TYPE_UINT64:
-+          gVar=g_variant_new_uint64(g_value_get_uint(gValue));
-+          break;
-       case G_TYPE_INT:
--          gVar=g_variant_new_int32(g_value_get_int(gValue));
-+          gVar=g_variant_new_int32(g_value_get_uint(gValue));
-+          break;
-+      case G_TYPE_INT64:
-+          gVar=g_variant_new_int64(g_value_get_uint(gValue));
-           break;
-       case G_TYPE_STRING:
-           gVar=g_variant_new_string(g_value_get_string(gValue));
-@@ -435,14 +449,14 @@ GVariant *g_value_to_g_variant(GValue *gValue){
- 
- static gboolean ibus_chewing_config_get_value(IBusConfig *config, const gchar *section, const gchar *key, GValue *gValue){
- #if IBUS_VERSION >= 10399
--    GVariant *gVar=g_variant_ref_sink(ibus_config_get_value(config, section, key));
--    if (gVar!=NULL){
--      g_variant_to_g_value(gVar, gValue);
--      g_variant_unref(gVar);
--      return TRUE;
--    }else{
-+    GVariant *gVar=ibus_config_get_value(config, section, key);
-+    if (gVar==NULL){
-       return FALSE;
-     }
-+    g_variant_ref_sink(gVar);
-+    g_variant_to_g_value(gVar, gValue);
-+    g_variant_unref(gVar);
-+    return TRUE;
- #else
-     return ibus_config_get_value(config, section, key, gValue);
- #endif
--- 
-1.7.4.4
-

diff --git a/ibus-chewing.spec b/ibus-chewing.spec
index c4bde82d939e5b19ec719062e5bb51bbd82aa0bc..67dce142136ebc481b9f08b440c8a5c86a990b4f 100644 (file)
--- a/ibus-chewing.spec
+++ b/ibus-chewing.spec
@@ -1,28 +1,29 @@
 Summary:       The Chewing engine for IBus input platform
+Summary(pl.UTF-8):     Silnik Chewing dla platformy wprowadzania znaków IBus
 Summary(zh_TW.UTF-8):  IBus新酷音輸入法
 Name:          ibus-chewing
-Version:       1.3.9.2
+Version:       1.4.2
 Release:       1
 License:       GPL v2+
 Group:         Libraries
 Source0:       http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz
-# Source0-md5: 8d177d67647944f5d1f9cca0654eaccb
-Patch0:                %{name}-696864-abrt-ibus-1.4.patch
+# Source0-md5: 67d944ddfb7dd4eb325967ce43390092
 URL:           http://code.google.com/p/ibus/
 BuildRequires: GConf2-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.2
 BuildRequires: gettext-devel
 BuildRequires: gob2 >= 2.0.16
-BuildRequires: gtk+2-devel
-BuildRequires: ibus-devel >= 1.1
+BuildRequires: gtk+2-devel >= 2.0
+BuildRequires: ibus-devel >= 1.4
 BuildRequires: libchewing-devel >= 0.3.3
 BuildRequires: pkgconfig
+BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXtst-devel
-BuildRequires: rpmbuild(macros) >= 1.600
-Requires:      ibus >= 1.1
-Requires:      libchewing >= 0.3.3
+BuildRequires: rpmbuild(macros) >= 1.604
+Requires(post,preun):  GConf2
 Requires:      GConf2
-Requires(post):        GConf2
+Requires:      ibus >= 1.4
+Requires:      libchewing >= 0.3.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _libexecdir     %{_libdir}/ibus
@@ -35,6 +36,13 @@ keyboard layout, such as standard (DaChen), IBM, Gin-Yeah, Eten, Eten
 
 Chewing also support toned Hanyu pinyin input.
 
+%description -l pl.UTF-8
+IBus-chewing to silnik dla platformy IBus będący interfejsem do
+inteligentnej metody wprowadzania znaków Chewing, przeznaczonej dla
+użytkowników Zhuyin (BoPoMoFo). Obsługuje różne układy klawiatury
+Zhuyin, takie jak standardowy (DaChen), IBM, Gin-Yeah, Eten, Eten 26,
+Hsu, Dvorak, Dvorak-Hsu, DaChen26.
+
 %description -l zh_TW.UTF-8
 IBus-chewing 是新酷音輸入法的IBus前端。
 新酷音輸入法是個智慧型注音輸入法，支援多種鍵盤布局，諸如：
@@ -45,13 +53,12 @@ Dvorak許氏 及大千26鍵。
 
 %prep
 %setup -q -n %{name}-%{version}-Source
-%patch0 -p1
 
 %build
 %cmake \
        -DLIBEXEC_DIR=%{_libexecdir}
 
-%{__make} VERBOSE=1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -74,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc RELEASE-NOTES.txt AUTHORS README ChangeLog USER-GUIDE
+%doc AUTHORS ChangeLog README RELEASE-NOTES.txt USER-GUIDE
 %attr(755,root,root) %{_libexecdir}/ibus-engine-chewing
 %{_datadir}/%{name}
 %{_datadir}/ibus/component/chewing.xml