diff --git a/.gitignore b/.gitignore index 37ea2f8..6c3cc74 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ibus-table-chinese-1.3.0.20101201-Source.tar.gz /ibus-table-chinese-1.3.0.20101206-Source.tar.gz +/ibus-table-chinese-1.3.0.20110114-Source.tar.gz diff --git a/ibus-table-chinese.spec b/ibus-table-chinese.spec index a5cc3d5..4581f40 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.0.20101206 +Version: 1.3.0.20110114 Release: 1%{?dist} Summary: Chinese input tables for IBus Summary(zh_CN): 中文码表输入法 @@ -15,11 +15,14 @@ Source0: http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake >= 2.4 +BuildRequires: cmake-fedora >= 0.4.0 BuildRequires: ibus-table-devel >= 1.2 BuildArch: noarch Requires: ibus-table >= 1.2 Requires(post): ibus-table >= 1.2 +Obsoletes: ibus-table-yinma < 1.3 +Obsoletes: ibus-table-xingma < 1.3 %description ibus-table-chinese is provides the infrastructure for Chinese input methods. @@ -209,6 +212,7 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Provides: ibus-table-stroke5 = %{version}-%{release} Obsoletes: ibus-table-stroke5 < 1.3 +Obsoletes: ibus-table-yinma < 1.3 %description stroke5 Erbi input method. @@ -313,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.0.20101206 +(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-table-chinese-1.3.0.20110114 %__rm -rf RELEASE-NOTES.txt AUTHORS ChangeLog COPYING README ) @@ -449,6 +453,10 @@ YongMa input method. %changelog +* Fri Jan 14 2011 Ding-Yi Chen - 1.3.0.20110114-1 +- Fix Bug 667877: ibus-table-yinma and ibus-table-xingma have been obsoleted. +- Now depends on cmake-fedora + * Mon Dec 06 2010 Ding-Yi Chen - 1.3.0.20101206-1 - New tables which was not include in original: + array30, array30-big, wubi-haifeng diff --git a/sources b/sources index 02b22c6..f9bb21a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -972187a35fbea5f45c8e02e4103f87be ibus-table-chinese-1.3.0.20101206-Source.tar.gz +2b9999204cdd6a3ea71dda85f98f8170 ibus-table-chinese-1.3.0.20110114-Source.tar.gz