Merge conflict

.gitignore

@@ -8,3 +8,4 @@
 /ibus-table-chinese-1.4.4-Source.tar.gz
 /ibus-table-chinese-1.4.5-Source.tar.gz
 /ibus-table-chinese-1.4.6-Source.tar.gz
+/ibus-table-chinese-1.8.0-Source.tar.gz

ibus-table-chinese.spec

@@ -2,33 +2,29 @@
 %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.4.6
-Release:    4%{?dist}
-Summary:    Chinese input tables for IBus
-Summary(zh_CN): 中文码表输入法
-Summary(zh_TW): 中文碼表輸入法
-License:    GPLv3+
-Group:      System Environment/Libraries
-URL:        http://code.google.com/p/ibus/
-Source0:    http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz
+Name:           ibus-table-chinese
+Version:        1.8.0
+Release:        1%{?dist}
+Summary:        Chinese input tables for IBus
+License:        GPLv3+
+Group:          System Environment/Libraries
+URL:            http://code.google.com/p/ibus/
+Source0:        https://fedorahosted.org/releases/c/m/%{name}/%{name}-%{version}-Source.tar.gz
 
-BuildRequires:  cmake >= 2.6
-BuildRequires:  ibus-table-devel >= 1.2
-
-BuildArch:  noarch
-Requires:   ibus-table >= 1.2
-Requires(post):   ibus-table >= 1.2
+BuildRequires:  cmake >= 2.6.2
+BuildRequires:  ibus-table-devel >= 1.2.0
+Requires:       ibus-table >= 1.2.0
 Obsoletes:      ibus-table-yinma < 1.3
 Obsoletes:      ibus-table-xingma < 1.3
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
 %description
 ibus-table-chinese is provides the infrastructure for Chinese input methods.
-Input tables themselves are in sub-packages.
+Input tables themselves are in subpackages.
+
 
-%description -l zh_TW
-ibus-table-chinese 提供了中文碼表輸入法的基礎架構。
-輸入法本身則在子套件裡。
 
 %package array
 Summary:       Array input methods
@@ -286,7 +282,6 @@ Wubi 86.
 %description -l zh_TW wubi-jidian
 使用極爽字庫極點五筆輸入法
 
-
 %package yong
 Summary: YongMa input method
 Summary(zh_CN): 永码输入法
@@ -311,19 +306,21 @@ YongMa input method.
 %{__sed} -i 's/\r//' tables/wubi-haifeng/COPYING
 
 %build
-# $RPM_OPT_FLAGS should be  loaded from cmake macro.
+# $RPM_OPT_FLAGS should be loaded from cmake macro.
 %cmake -DMANAGE_MESSAGE_LEVEL=%{message_level} -DCMAKE_FEDORA_ENABLE_FEDORA_BUILD=1 .
 %__make VERBOSE=1  %{?_smp_mflags}
 
-%install
-%__make install DESTDIR=$RPM_BUILD_ROOT
-# We install document using %doc
-(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-table-chinese-1.4.6
-    rm -rf AUTHORS README ChangeLog COPYING README
-)
-
 %clean
 
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+# We install document using doc 
+rm -fr %{buildroot}%{_docdir}/*
+
+
+
 %post array
 %{createdb} -i -n %{ibus_tables_dir}/array30.db
 %{createdb} -i -n %{ibus_tables_dir}/array30-big.db
@@ -368,9 +365,8 @@ YongMa input method.
 %post yong
 %{createdb} -i -n %{ibus_tables_dir}/yong.db
 
-
 %files
-%doc AUTHORS README ChangeLog COPYING README
+%doc 
 
 %files array
 %{ibus_icons_dir}/array30.*
@@ -437,8 +433,13 @@ YongMa input method.
 %{ibus_icons_dir}/yong.*
 %{ibus_tables_dir}/yong.db
 
-
 %changelog
+<<<<<<< HEAD
+* Sat Jun 07 2014 Ding-Yi Chen <dchen@redhat.com> - 1.8.0-1
+- Update for ibus-table-1.8.0
+- Fixed Bug 1099380 - The stroke5 table should not use 
+  "AUTO_SELECT = TRUE" but "AUTO_SELECT = FALSE"
+
 * Tue May 27 2014 Mike FABIAN <mfabian@redhat.com> - 1.4.6-4
 - bump release number to build against updated ibus-table
 
@@ -511,5 +512,6 @@ YongMa input method.
 * Mon Aug 31 2009 Caius 'kaio' Chance <k at kaio.me> - 1.3.0.20100527-2
 - Added CangJie (big) table.
 
-* Wed Aug 19 2008 Yu Yuwei <acevery@gmail.com> - 1.3.0.20100527-1
+* Tue Aug 19 2008 Yu Yuwei <acevery@gmail.com> - 1.3.0.20100527-1
 - The first version.
+

sources

@@ -1 +1 @@
-552dc3e28fbbf52435d3ce41fc09ac35  ibus-table-chinese-1.4.6-Source.tar.gz
+4bd95d855a43dbf023dff820a07968c5  ibus-table-chinese-1.8.0-Source.tar.gz