From ebdad2cdbd25b8a160b5c35cae1cbdd8579fda81 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 05:58:07 -0600 Subject: [PATCH 1/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- ibus-table-chinese.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ibus-table-chinese.spec b/ibus-table-chinese.spec index 4581f40..dce8a91 100644 --- a/ibus-table-chinese.spec +++ b/ibus-table-chinese.spec @@ -3,7 +3,7 @@ %define createdb ibus-table-createdb Name: ibus-table-chinese Version: 1.3.0.20110114 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Chinese input tables for IBus Summary(zh_CN): 中文码表输入法 Summary(zh_TW): 中文碼表輸入法 @@ -453,6 +453,9 @@ 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 + * 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 From 976fc2fcfe2e53dfc5c7afad4cc92b78d0be1086 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 30 Aug 2011 16:06:56 +1000 Subject: [PATCH 2/6] "Fixed issue 787; Fixed Bug 715707; Support cmake-fedora-0.7.1" --- .gitignore | 1 + ibus-table-chinese.spec | 61 ++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 35 insertions(+), 29 deletions(-) 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 From 08357cea0fc90764dc43629ab9b35ed115773a41 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Fri, 28 Oct 2011 17:29:03 +1000 Subject: [PATCH 3/6] "Merge Caius Chance's branch for DYNAMIC_ADJUST" --- .gitignore | 1 + ibus-table-chinese.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) 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 From 7f2831adc128cf071ab226b8d7ac3c5b1c0bab4d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 23:39:12 -0600 Subject: [PATCH 4/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- ibus-table-chinese.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ibus-table-chinese.spec b/ibus-table-chinese.spec index dce8a91..b961d44 100644 --- a/ibus-table-chinese.spec +++ b/ibus-table-chinese.spec @@ -3,7 +3,7 @@ %define createdb ibus-table-createdb Name: ibus-table-chinese Version: 1.3.0.20110114 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Chinese input tables for IBus Summary(zh_CN): 中文码表输入法 Summary(zh_TW): 中文碼表輸入法 @@ -453,6 +453,9 @@ YongMa input method. %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.3.0.20110114-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Feb 09 2011 Fedora Release Engineering - 1.3.0.20110114-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From bdc14d25d34df91103ec3fbd6c6fe96137d2b43a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 09:29:51 -0500 Subject: [PATCH 5/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- ibus-table-chinese.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ibus-table-chinese.spec b/ibus-table-chinese.spec index f713049..5fda653 100644 --- a/ibus-table-chinese.spec +++ b/ibus-table-chinese.spec @@ -3,7 +3,7 @@ %define createdb ibus-table-createdb Name: ibus-table-chinese Version: 1.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Chinese input tables for IBus Summary(zh_CN): 中文码表输入法 Summary(zh_TW): 中文碼表輸入法 @@ -453,6 +453,9 @@ YongMa input method. %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 1.3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 1.3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From b5b1379504872b00a5fa753db22452082ea67158 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Fri, 7 Sep 2012 17:08:39 +1000 Subject: [PATCH 6/6] Fixed Bug 855250; Fixed Google issue 1405 --- .gitignore | 1 + ibus-table-chinese.spec | 29 +++++++++++++++++------------ sources | 2 +- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 0a5a67b..b9dae9d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /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 +/ibus-table-chinese-1.4.0-Source.tar.gz diff --git a/ibus-table-chinese.spec b/ibus-table-chinese.spec index 5fda653..cdfb76c 100644 --- a/ibus-table-chinese.spec +++ b/ibus-table-chinese.spec @@ -1,9 +1,10 @@ -%define ibus_tables_dir %{_datadir}/ibus-table/tables -%define ibus_icons_dir %{_datadir}/ibus-table/icons -%define createdb ibus-table-createdb +%global message_level 6 +%global ibus_tables_dir %{_datadir}/ibus-table/tables +%global ibus_icons_dir %{_datadir}/ibus-table/icons +%global createdb ibus-table-createdb Name: ibus-table-chinese -Version: 1.3.5 -Release: 3%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Chinese input tables for IBus Summary(zh_CN): 中文码表输入法 Summary(zh_TW): 中文碼表輸入法 @@ -15,7 +16,6 @@ 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.8.1 BuildRequires: ibus-table-devel >= 1.2 BuildArch: noarch @@ -202,8 +202,6 @@ This package includes the Smart Cangjie 6. 」等功能，而且還能肩負起促進「資訊科技教育、母語教育 和特殊教育」等多重任務。 - - %package stroke5 Summary: Stroke 5 input method Summary(zh_CN): 笔顺五码输入法 @@ -310,15 +308,15 @@ YongMa input method. %build # $RPM_OPT_FLAGS should be loaded from cmake macro. -%cmake . +%cmake -DMANAGE_MESSAGE_LEVEL=%{message_level} -DCMAKE_FEDORA_ENABLE_FEDORA_BUILD=1 . %__make VERBOSE=1 %{?_smp_mflags} %install %__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.5 - %__rm -rf RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING README +(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-table-chinese-1.4.0 + %__rm -rf AUTHORS README ChangeLog COPYING README ) %clean @@ -371,7 +369,7 @@ YongMa input method. %files %defattr(-,root,root,-) -%doc RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING README +%doc AUTHORS README ChangeLog COPYING README %files array %defattr(-,root,root,-) @@ -453,6 +451,13 @@ YongMa input method. %changelog +* Fri Sep 07 2012 Ding-Yi Chen - 1.4.0-1 +- Table build scripts has been refactored. +- cmake-fedora is added as submodule. +- Fixed Bug 855250 - Change the default filtering for Quick and Cangjie by + merging maxiaojun's repository +- Fixed Google Issue 1405: failed to build ibus-table-chinese due to missing db files + * Thu Jul 19 2012 Fedora Release Engineering - 1.3.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 3ddf68f..52b48a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4352c8a63702ee68be236563539f558f ibus-table-chinese-1.3.5-Source.tar.gz +f65ce1bb41eb90e7ecc122b7d34df776 ibus-table-chinese-1.4.0-Source.tar.gz