From e769c726ebc0c1e9505ba9538a64116fe01fcf12 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Jun 04 2010 04:04:45 +0000 Subject: Fix google issue 942 --- diff --git a/.cvsignore b/.cvsignore index cc568b8..a256074 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ibus-chewing-1.2.99.20100317-Source.tar.gz +ibus-chewing-1.3.4.20100605-Source.tar.gz diff --git a/ibus-chewing.spec b/ibus-chewing.spec index c81d48c..59d57ec 100644 --- a/ibus-chewing.spec +++ b/ibus-chewing.spec @@ -1,6 +1,6 @@ Name: ibus-chewing -Version: 1.2.99.20100317 -Release: 2%{?dist} +Version: 1.3.4.20100605 +Release: 1%{?dist} Summary: The Chewing engine for IBus input platform Summary(zh_TW): IBus新酷音輸入法 License: GPLv2+ @@ -14,7 +14,13 @@ BuildRequires: gettext-devel BuildRequires: gtk2-devel BuildRequires: ibus-devel >= 1.1 BuildRequires: cmake >= 2.4 -BuildRequires: gob2 + +# Make sure gob2 is patched against https://bugzilla.redhat.com/show_bug.cgi?id=519108 +%if 0%{?fedora} == 11 +BuildRequires: gob2 >= 2.0.15-5 +%else +BuildRequires: gob2 >= 2.0.16-4 +%endif BuildRequires: libchewing-devel >= 0.3.2-16 BuildRequires: pkgconfig BuildRequires: GConf2-devel @@ -90,6 +96,14 @@ fi %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas %changelog +* Fri Jun 04 2010 Ding-Yi Chen - 1.3.4.20100605-1 +- Fix Issue 942: Fix unsunk references in ibus-chewing + Applied the patch provided by zork@chromium.org. +- Rename CVS_DIST_TAGS to FEDORA_DIST_TAGS, and move its + definition to cmake_modules/ +- Gob2 generated file is now removed, because + Bug 519108 is fixed from Fedora 11. + * Wed Apr 07 2010 Peng Huang - 1.2.99.20100317-2 - Rebuild with ibus-1.3.0 @@ -286,13 +300,3 @@ Fix the errors which Funda Wang as pointing out: - - - - - - - - - - diff --git a/import.log b/import.log index 04ff7db..062c375 100644 --- a/import.log +++ b/import.log @@ -24,3 +24,4 @@ ibus-chewing-1_2_99_20100212-1_fc12:F-12:ibus-chewing-1.2.99.20100212-1.fc12.src ibus-chewing-1_2_99_20100216-1_fc12:F-12:ibus-chewing-1.2.99.20100216-1.fc12.src.rpm:1266306507 ibus-chewing-1_2_99_20100217-1_fc12:F-12:ibus-chewing-1.2.99.20100217-1.fc12.src.rpm:1266478705 ibus-chewing-1_2_99_20100317-1_fc12:F-12:ibus-chewing-1.2.99.20100317-1.fc12.src.rpm:1268796994 +ibus-chewing-1_3_4_20100605-1_fc12:F-12:ibus-chewing-1.3.4.20100605-1.fc12.src.rpm:1275624234 diff --git a/sources b/sources index 4fa067c..e98f097 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -94d7becb485c0bc0e1be933b3a3825f4 ibus-chewing-1.2.99.20100317-Source.tar.gz +763584b2d790c524f034f420c3518da6 ibus-chewing-1.3.4.20100605-Source.tar.gz