Merge branch 'master' into el6

Conflicts:
	.gitignore
	ibus-table-chinese.spec
	sources

.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

ibus-table-chinese.spec

@@ -1,8 +1,9 @@
-%define ibus_tables_dir %{_datadir}/ibus-table/tables
+%global message_level 6
-%define ibus_icons_dir %{_datadir}/ibus-table/icons
+%global ibus_tables_dir %{_datadir}/ibus-table/tables
-%define createdb ibus-table-createdb
+%global ibus_icons_dir %{_datadir}/ibus-table/icons
+%global createdb ibus-table-createdb
 Name:       ibus-table-chinese
-Version:    1.3.5
+Version:    1.4.0
 Release:    1%{?dist}
 Summary:    Chinese input tables for IBus
 Summary(zh_CN): 中文码表输入法
@@ -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
+(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-table-chinese-1.4.0
-    %__rm -rf RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING README
+    %__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,19 @@ YongMa input method.
 
 
 %changelog
+* Fri Sep 07 2012 Ding-Yi Chen <dchen@redhat.com> - 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 <rel-eng@lists.fedoraproject.org> - 1.3.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Fri Oct 28 2011 Ding-Yi Chen <dchen@redhat.com> - 1.3.5-1
 - Merge Caius Chance's branch for DYNAMIC_ADJUST
 - Dependency update to cmake-0.8.1

sources

@@ -1 +1 @@
-4352c8a63702ee68be236563539f558f  ibus-table-chinese-1.3.5-Source.tar.gz
+f65ce1bb41eb90e7ecc122b7d34df776  ibus-table-chinese-1.4.0-Source.tar.gz