From 976fc2fcfe2e53dfc5c7afad4cc92b78d0be1086 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Aug 30 2011 06:06:56 +0000 Subject: "Fixed issue 787; Fixed Bug 715707; Support cmake-fedora-0.7.1" --- diff --git a/.gitignore b/.gitignore index 6c3cc74..db1a47f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /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 +/ibus-table-chinese-1.3.4-Source.tar.gz diff --git a/ibus-table-chinese.spec b/ibus-table-chinese.spec index dce8a91..eb2e1e5 100644 --- a/ibus-table-chinese.spec +++ b/ibus-table-chinese.spec @@ -2,8 +2,8 @@ %define ibus_icons_dir %{_datadir}/ibus-table/icons %define createdb ibus-table-createdb Name: ibus-table-chinese -Version: 1.3.0.20110114 -Release: 2%{?dist} +Version: 1.3.4 +Release: 1%{?dist} Summary: Chinese input tables for IBus Summary(zh_CN): 中文码表输入法 Summary(zh_TW): 中文碼表輸入法 @@ -14,8 +14,8 @@ 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: cmake >= 2.6 +BuildRequires: cmake-fedora >= 0.7.994 BuildRequires: ibus-table-devel >= 1.2 BuildArch: noarch @@ -317,8 +317,8 @@ 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.20110114 - %__rm -rf RELEASE-NOTES.txt AUTHORS ChangeLog COPYING README +(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-table-chinese-1.3.4 + %__rm -rf RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING README ) %clean @@ -371,80 +371,80 @@ YongMa input method. %files %defattr(-,root,root,-) -%doc RELEASE-NOTES.txt AUTHORS ChangeLog COPYING README +%doc RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING README %files array %defattr(-,root,root,-) %{ibus_icons_dir}/array30.* -%{ibus_tables_dir}/array30.db +%verify(not size md5 mtime) %{ibus_tables_dir}/array30.db %{ibus_icons_dir}/array30-big.* -%{ibus_tables_dir}/array30-big.db +%verify(not size md5 mtime) %{ibus_tables_dir}/array30-big.db %files cangjie %defattr(-,root,root,-) %{ibus_icons_dir}/cangjie3.* -%{ibus_tables_dir}/cangjie3.db +%verify(not size md5 mtime) %{ibus_tables_dir}/cangjie3.db %{ibus_icons_dir}/cangjie5.* -%{ibus_tables_dir}/cangjie5.db +%verify(not size md5 mtime) %{ibus_tables_dir}/cangjie5.db %{ibus_icons_dir}/cangjie-big.* -%{ibus_tables_dir}/cangjie-big.db +%verify(not size md5 mtime) %{ibus_tables_dir}/cangjie-big.db %files cantonese %defattr(-,root,root,-) %{ibus_icons_dir}/cantonese.* -%{ibus_tables_dir}/cantonese.db +%verify(not size md5 mtime) %{ibus_tables_dir}/cantonese.db %{ibus_icons_dir}/cantonhk.* -%{ibus_tables_dir}/cantonhk.db +%verify(not size md5 mtime) %{ibus_tables_dir}/cantonhk.db %{ibus_icons_dir}/jyutping.* -%{ibus_tables_dir}/jyutping.db +%verify(not size md5 mtime) %{ibus_tables_dir}/jyutping.db %files easy %defattr(-,root,root,-) %{ibus_icons_dir}/easy-big.* -%{ibus_tables_dir}/easy-big.db +%verify(not size md5 mtime) %{ibus_tables_dir}/easy-big.db %files erbi %defattr(-,root,root,-) %{ibus_icons_dir}/erbi.* -%{ibus_tables_dir}/erbi.db +%verify(not size md5 mtime) %{ibus_tables_dir}/erbi.db %{ibus_icons_dir}/erbi-qs.* -%{ibus_tables_dir}/erbi-qs.db +%verify(not size md5 mtime) %{ibus_tables_dir}/erbi-qs.db %files quick %defattr(-,root,root,-) %{ibus_icons_dir}/quick3.* -%{ibus_tables_dir}/quick3.db +%verify(not size md5 mtime) %{ibus_tables_dir}/quick3.db %{ibus_icons_dir}/quick5.* -%{ibus_tables_dir}/quick5.db +%verify(not size md5 mtime) %{ibus_tables_dir}/quick5.db %{ibus_icons_dir}/quick-classic.* -%{ibus_tables_dir}/quick-classic.db +%verify(not size md5 mtime) %{ibus_tables_dir}/quick-classic.db %files scj %defattr(-,root,root,-) %{ibus_icons_dir}/scj6.* -%{ibus_tables_dir}/scj6.db +%verify(not size md5 mtime) %{ibus_tables_dir}/scj6.db %files stroke5 %defattr(-,root,root,-) %{ibus_icons_dir}/stroke5.* -%{ibus_tables_dir}/stroke5.db +%verify(not size md5 mtime) %{ibus_tables_dir}/stroke5.db %files wu %defattr(-,root,root,-) %{ibus_icons_dir}/wu.* -%{ibus_tables_dir}/wu.db +%verify(not size md5 mtime) %{ibus_tables_dir}/wu.db %files wubi-haifeng %defattr(-,root,root,-) %doc tables/wubi-haifeng/COPYING tables/wubi-haifeng/README %{ibus_icons_dir}/wubi-haifeng86.* -%{ibus_tables_dir}/wubi-haifeng86.db +%verify(not size md5 mtime) %{ibus_tables_dir}/wubi-haifeng86.db %files wubi-jidian %defattr(-,root,root,-) %{ibus_icons_dir}/wubi-jidian86.* -%{ibus_tables_dir}/wubi-jidian86.db +%verify(not size md5 mtime) %{ibus_tables_dir}/wubi-jidian86.db %files yong %defattr(-,root,root,-) @@ -453,8 +453,13 @@ YongMa input method. %changelog -* Wed Feb 09 2011 Fedora Release Engineering - 1.3.0.20110114-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild +* Tue Aug 30 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 +- Make it compatible with cmake-fedora-0.7.994 +- Move the cmake policies to the front +- Suppress the misleading warning from rpm -V * 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. diff --git a/sources b/sources index f9bb21a..367edd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b9999204cdd6a3ea71dda85f98f8170 ibus-table-chinese-1.3.0.20110114-Source.tar.gz +252d5bc459f546cca7d946294382d7ef ibus-table-chinese-1.3.4-Source.tar.gz