From e97413c8e251811c8e95e249cf1b99121456ab00 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Oct 28 2011 07:57:02 +0000 Subject: "Merge Caius Chance's branch for DYNAMIC_ADJUST" --- diff --git a/.gitignore b/.gitignore index db1a47f..0a5a67b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /ibus-table-chinese-1.3.0.20101206-Source.tar.gz /ibus-table-chinese-1.3.0.20110114-Source.tar.gz /ibus-table-chinese-1.3.4-Source.tar.gz +/ibus-table-chinese-1.3.5-Source.tar.gz diff --git a/ibus-table-chinese.spec b/ibus-table-chinese.spec index eb2e1e5..6b3ae49 100644 --- a/ibus-table-chinese.spec +++ b/ibus-table-chinese.spec @@ -2,7 +2,7 @@ %define ibus_icons_dir %{_datadir}/ibus-table/icons %define createdb ibus-table-createdb Name: ibus-table-chinese -Version: 1.3.4 +Version: 1.3.5 Release: 1%{?dist} Summary: Chinese input tables for IBus Summary(zh_CN): 中文码表输入法 @@ -15,7 +15,7 @@ Source0: http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake >= 2.6 -BuildRequires: cmake-fedora >= 0.7.994 +BuildRequires: cmake-fedora >= 0.8.1 BuildRequires: ibus-table-devel >= 1.2 BuildArch: noarch @@ -317,7 +317,7 @@ YongMa input method. %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT # We install document using %doc -(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-table-chinese-1.3.4 +(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-table-chinese-1.3.5 %__rm -rf RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING README ) @@ -453,7 +453,11 @@ YongMa input method. %changelog -* Tue Aug 30 2011 Ding-Yi Chen - 1.3.4-1 +* Fri Oct 28 2011 Ding-Yi Chen - 1.3.5-1 +- Merge Caius Chance's branch for DYNAMIC_ADJUST +- Dependency update to cmake-0.8.1 + +* Wed Aug 31 2011 Ding-Yi Chen - 1.3.4-1 - Fixed Bug 715707 - FTBFS ibus-table-chinese-1.3.0.20110114-2.fc15 - Fixed Bug 629212 - bad candidate orders in ibus-table-quick - Merged patch from sagara @ github, which address IBus issue 787 diff --git a/sources b/sources index 367edd7..3ddf68f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -252d5bc459f546cca7d946294382d7ef ibus-table-chinese-1.3.4-Source.tar.gz +4352c8a63702ee68be236563539f558f ibus-table-chinese-1.3.5-Source.tar.gz