From 458d14358d8cfe1daad980d4198d1300ae04860b Mon Sep 17 00:00:00 2001
From: cchance <cchance@fedoraproject.org>
Date: Tue, 3 Mar 2009 23:03:11 +0000
Subject: [PATCH] - Resolves: rhbz#484650 - Updated to latest upstream release.
 - Splitted chinese input methods into modules.

---
 ibus-table.spec | 143 ++++++++++++++++++++++--------------------------
 1 file changed, 64 insertions(+), 79 deletions(-)

diff --git a/ibus-table.spec b/ibus-table.spec
index 8486b27..f19baaa 100644
--- a/ibus-table.spec
+++ b/ibus-table.spec
@@ -1,13 +1,11 @@
 Name:       ibus-table
-Version:    0.1.1.20081014
-Release:    5%{?dist}
+Version:    1.1.0.20090220 
+Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:     ibus-table-0.1.1.20081014-4a.rhbz466430.patch
-Patch1:     ibus-table-0.1.1.20081014-4b.rhbz466844.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -19,14 +17,6 @@ Requires:   ibus
 %description
 The package contains general Table engine for IBus platform.
 
-%package chinese
-Summary:    Chinese tables for general table engine of IBus
-Group:      System Environment/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description chinese
-This package contains Chineses tables.
-
 %package additional
 Summary:    Additional tables for general table engine of IBus
 Group:      System Environment/Libraries
@@ -36,20 +26,11 @@ Requires:   %{name} = %{version}-%{release}
 This package contains additional tables.
 
 %prep
-%setup -q
-%patch0 -p1 -b .4a-bz466430
-%patch1 -p1 -b .4b-bz466844
+%setup -b0 -q
 
 %build
-%configure \
-    --disable-static \
-    --enable-zhengma \
-    --enable-wubi86 \
-    --enable-wubi98 \
-    --enable-cangjie5 \
-    --enable-erbi-qs \
-    --enable-additional
-#     --enable-extra-phrases
+cd ../%{name}-%{version}
+%configure --disable-static --enable-additional
 
 make %{?_smp_mflags}
 
@@ -62,13 +43,6 @@ make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post chinese
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/wubi86.db
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/wubi98.db
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/cangjie5.db
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/erbi_qs.db
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/zhengma.db
-
 %post additional
 ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/compose.db
 ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/latex.db
@@ -76,59 +50,70 @@ ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/latex.db
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%dir %{_datadir}/ibus-table
-%dir %{_datadir}/ibus-table/engine
-%dir %{_datadir}/ibus-table/tables
-%dir %{_datadir}/ibus-table/icons
-%dir %{_datadir}/ibus-table/data
-%{_datadir}/ibus-table/engine/
-%{_datadir}/ibus-table/tables/template.txt
-%{_datadir}/ibus-table/icons/ibus-table.svg
-%{_datadir}/ibus-table/icons/full-letter.svg
-%{_datadir}/ibus-table/icons/full-punct.svg
-%{_datadir}/ibus-table/icons/half-letter.svg
-%{_datadir}/ibus-table/icons/half-punct.svg
-%{_datadir}/ibus-table/icons/onechar.svg
-%{_datadir}/ibus-table/icons/phrase.svg
-%{_datadir}/ibus-table/icons/py-mode.svg
-%{_datadir}/ibus-table/icons/tab-mode.svg
-%{_datadir}/ibus-table/icons/chinese.svg
-%{_datadir}/ibus-table/icons/dcommit.svg
-%{_datadir}/ibus-table/icons/english.svg
-%{_datadir}/ibus-table/icons/ncommit.svg
-%{_bindir}/ibus-engine-table
-%{_bindir}/ibus-table-createdb
-
-%files chinese
-%defattr(-,root,root,-)
-%{_datadir}/ibus-table/data/pinyin_table.txt.bz2
-%{_datadir}/ibus-table/tables/extra_phrase.txt.bz2
-%{_datadir}/ibus-table/tables/wubi86.db
-%{_datadir}/ibus-table/tables/wubi98.db
-%{_datadir}/ibus-table/tables/cangjie5.db
-%{_datadir}/ibus-table/tables/erbi_qs.db
-%{_datadir}/ibus-table/tables/zhengma.db
-%{_datadir}/ibus-table/icons/wubi86.svg
-%{_datadir}/ibus-table/icons/wubi98.svg
-%{_datadir}/ibus-table/icons/cangjie5.svg
-%{_datadir}/ibus-table/icons/erbi-qs.svg
-%{_datadir}/ibus-table/icons/zhengma.svg
-%{_datadir}/ibus/engine/wubi86.engine
-%{_datadir}/ibus/engine/wubi98.engine
-%{_datadir}/ibus/engine/cangjie5.engine
-%{_datadir}/ibus/engine/erbi_qs.engine
-%{_datadir}/ibus/engine/zhengma.engine
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/engine
+%dir %{_datadir}/%{name}/tables
+%dir %{_datadir}/%{name}/icons
+%dir %{_datadir}/%{name}/data
+%{_datadir}/ibus/component/table.xml
+%{_libdir}/pkgconfig/%{name}.pc
+%{_libexecdir}/ibus-engine-table
+%{_bindir}/%{name}-createdb
+%{_datadir}/%{name}/tables/template.txt
+%{_datadir}/%{name}/icons/%{name}.svg
+%{_datadir}/%{name}/icons/full-letter.svg
+%{_datadir}/%{name}/icons/full-punct.svg
+%{_datadir}/%{name}/icons/half-letter.svg
+%{_datadir}/%{name}/icons/half-punct.svg
+%{_datadir}/%{name}/icons/onechar.svg
+%{_datadir}/%{name}/icons/phrase.svg
+%{_datadir}/%{name}/icons/py-mode.svg
+%{_datadir}/%{name}/icons/tab-mode.svg
+%{_datadir}/%{name}/icons/chinese.svg
+%{_datadir}/%{name}/icons/dcommit.svg
+%{_datadir}/%{name}/icons/english.svg
+%{_datadir}/%{name}/icons/ncommit.svg
+%{_datadir}/%{name}/data/pinyin_table.txt.bz2
+%{_datadir}/%{name}/engine/factory.py
+%{_datadir}/%{name}/engine/factory.pyc
+%{_datadir}/%{name}/engine/factory.pyo
+%{_datadir}/%{name}/engine/main.py
+%{_datadir}/%{name}/engine/main.pyc
+%{_datadir}/%{name}/engine/main.pyo
+%{_datadir}/%{name}/engine/speedmeter.py
+%{_datadir}/%{name}/engine/speedmeter.pyc
+%{_datadir}/%{name}/engine/speedmeter.pyo
+%{_datadir}/%{name}/engine/tabcreatedb.py
+%{_datadir}/%{name}/engine/tabcreatedb.pyc
+%{_datadir}/%{name}/engine/tabcreatedb.pyo
+%{_datadir}/%{name}/engine/tabdict.py
+%{_datadir}/%{name}/engine/tabdict.pyc
+%{_datadir}/%{name}/engine/tabdict.pyo
+%{_datadir}/%{name}/engine/table.py
+%{_datadir}/%{name}/engine/table.pyc
+%{_datadir}/%{name}/engine/table.pyo
+%{_datadir}/%{name}/engine/tabsqlitedb.py
+%{_datadir}/%{name}/engine/tabsqlitedb.pyc
+%{_datadir}/%{name}/engine/tabsqlitedb.pyo
+%{_datadir}/%{name}/icons/cb-mode.svg
+%{_datadir}/%{name}/icons/sc-mode.svg
+%{_datadir}/%{name}/icons/scb-mode.svg
+%{_datadir}/%{name}/icons/tc-mode.svg
+%{_datadir}/%{name}/icons/tcb-mode.svg
 
 %files additional
 %defattr(-,root,root,-)
-%{_datadir}/ibus-table/tables/compose.db
-%{_datadir}/ibus-table/tables/latex.db
-%{_datadir}/ibus-table/icons/compose.svg
-%{_datadir}/ibus-table/icons/latex.svg
-%{_datadir}/ibus/engine/compose.engine
-%{_datadir}/ibus/engine/latex.engine
+%{_datadir}/%{name}/tables/compose.db
+%{_datadir}/%{name}/tables/latex.db
+%{_datadir}/%{name}/icons/compose.svg
+%{_datadir}/%{name}/icons/latex.svg
 
 %changelog
+* Mon Mar 02 2009 Caius Chance <cchance@redhat.com> - 1.1.0.20090220-1.fc11
+- Resolves: rhbz#484650
+- Updated to latest upstream release.
+- Splitted chinese input methods into modules.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.1.20081014-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild