Merge branch 'master' into el6

.gitignore

@@ -5,3 +5,4 @@
 /ibus-table-chinese-1.3.5-Source.tar.gz
 /ibus-table-chinese-1.4.0-Source.tar.gz
 /ibus-table-chinese-1.4.2-Source.tar.gz
+/ibus-table-chinese-1.4.4-Source.tar.gz

ibus-table-chinese.spec

@@ -3,7 +3,7 @@
 %global ibus_icons_dir %{_datadir}/ibus-table/icons
 %global createdb ibus-table-createdb
 Name:       ibus-table-chinese
-Version:    1.4.2
+Version:    1.4.4
 Release:    1%{?dist}
 Summary:    Chinese input tables for IBus
 Summary(zh_CN): 中文码表输入法
@@ -13,8 +13,6 @@ Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 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:  ibus-table-devel >= 1.2
 
@@ -312,15 +310,13 @@ YongMa input method.
 %__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.4.2
+(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-table-chinese-1.4.4
-    %__rm -rf AUTHORS README ChangeLog COPYING README
+    rm -rf AUTHORS README ChangeLog COPYING README
 )
 
 %clean
-%__rm -rf $RPM_BUILD_ROOT
 
 %post array
 %{createdb} -i -n %{ibus_tables_dir}/array30.db
@@ -368,18 +364,15 @@ YongMa input method.
 
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS README ChangeLog COPYING README
 
 %files array
-%defattr(-,root,root,-)
 %{ibus_icons_dir}/array30.*
 %verify(not size md5 mtime) %{ibus_tables_dir}/array30.db
 %{ibus_icons_dir}/array30-big.*
 %verify(not size md5 mtime) %{ibus_tables_dir}/array30-big.db
 
 %files cangjie
-%defattr(-,root,root,-)
 %{ibus_icons_dir}/cangjie3.*
 %verify(not size md5 mtime) %{ibus_tables_dir}/cangjie3.db
 %{ibus_icons_dir}/cangjie5.*
@@ -388,7 +381,6 @@ YongMa input method.
 %verify(not size md5 mtime) %{ibus_tables_dir}/cangjie-big.db
 
 %files cantonese
-%defattr(-,root,root,-)
 %{ibus_icons_dir}/cantonese.*
 %verify(not size md5 mtime) %{ibus_tables_dir}/cantonese.db
 %{ibus_icons_dir}/cantonhk.*
@@ -397,19 +389,16 @@ YongMa input method.
 %verify(not size md5 mtime) %{ibus_tables_dir}/jyutping.db
 
 %files easy
-%defattr(-,root,root,-)
 %{ibus_icons_dir}/easy-big.*
 %verify(not size md5 mtime) %{ibus_tables_dir}/easy-big.db
 
 %files erbi
-%defattr(-,root,root,-)
 %{ibus_icons_dir}/erbi.*
 %verify(not size md5 mtime) %{ibus_tables_dir}/erbi.db
 %{ibus_icons_dir}/erbi-qs.*
 %verify(not size md5 mtime) %{ibus_tables_dir}/erbi-qs.db
 
 %files quick
-%defattr(-,root,root,-)
 %{ibus_icons_dir}/quick3.*
 %verify(not size md5 mtime) %{ibus_tables_dir}/quick3.db
 %{ibus_icons_dir}/quick5.*
@@ -418,40 +407,33 @@ YongMa input method.
 %verify(not size md5 mtime) %{ibus_tables_dir}/quick-classic.db
 
 %files scj
-%defattr(-,root,root,-)
 %{ibus_icons_dir}/scj6.*
 %verify(not size md5 mtime) %{ibus_tables_dir}/scj6.db
 
-
 %files stroke5
-%defattr(-,root,root,-)
 %{ibus_icons_dir}/stroke5.*
 %verify(not size md5 mtime) %{ibus_tables_dir}/stroke5.db
 
 %files wu
-%defattr(-,root,root,-)
 %{ibus_icons_dir}/wu.*
 %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.*
 %verify(not size md5 mtime) %{ibus_tables_dir}/wubi-haifeng86.db
 
 %files wubi-jidian
-%defattr(-,root,root,-)
 %{ibus_icons_dir}/wubi-jidian86.*
 %verify(not size md5 mtime) %{ibus_tables_dir}/wubi-jidian86.db
 
 %files yong
-%defattr(-,root,root,-)
 %{ibus_icons_dir}/yong.*
 %{ibus_tables_dir}/yong.db
 
 
 %changelog
-* Mon Nov 26 2012 Ding-Yi Chen <dchen@redhat.com> - 1.4.2-1
+* Mon Nov 26 2012 Ding-Yi Chen <dchen@redhat.com> - 1.4.4-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

sources

@@ -1 +1 @@
-1866c8bc90d5ef161a058709f22ecbe5  ibus-table-chinese-1.4.2-Source.tar.gz
+68a07fd8de1992c3453a74a3a751a362  ibus-table-chinese-1.4.4-Source.tar.gz