rpms/ibus-table-cangjie/devel ibus-table-cangjie.spec,1.16,1.17

[cchance]

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-cangjie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9006

Modified Files:
	ibus-table-cangjie.spec 
Log Message:
* Wed Jan 06 2010 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20100106-1.fc13
- Combined CangJie3, CangJie5, CangJie Big, Quick3, Quick5, Quick Classic,
  Easy Big into ibus-table-cangjie.




Index: ibus-table-cangjie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-cangjie/devel/ibus-table-cangjie.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ibus-table-cangjie.spec	31 Aug 2009 08:16:16 -0000	1.16
+++ ibus-table-cangjie.spec	6 Jan 2010 01:34:05 -0000	1.17
@@ -1,12 +1,12 @@
 Name:       ibus-table-cangjie
-Version:    1.2.0.20090831
-Release:    2%{?dist}
-Summary:    CangJie tables for IBus-Table
-License:    Public Domain and GPLv2+ 
+Version:    1.2.0.20100106
+Release:    1%{?dist}
+Summary:    Cang Jie and derived tables for IBus-Table
+License:    GPLv3
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
-Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1:    COPYING.tables
+#Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+Source0:    http://cloud.github.com/downloads/kaio/ibus-table-cangjie/%{name}-%{version}.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -15,13 +15,15 @@ Requires:         ibus >= 1.2, ibus-tabl
 Requires(post):   ibus >= 1.2, ibus-table >= 1.2
 BuildRequires:    ibus >= 1.2, ibus-table >= 1.2
 
+Obsoletes:        ibus-table-quick <= 1.2.0.20100106, ibus-table-easy <= 1.2.0.20100106
+Conflicts:        ibus-table-quick >  1.2.0.20100106, ibus-table-easy >  1.2.0.20100106
+
 %description
-The package contains CangJie tables for IBus-Table. 
+The package contains Cang Jie and derived tables for IBus-Table, namely Cang \
+Jie 3, Cang Jie 5, Cang Jie (big), Quick 3, Quick 5, Quick Classic, Easy (big).
 
 %prep
 %setup -q
-%__cp COPYING icons/COPYING.icons
-%__cp %{SOURCE1} tables/COPYING.tables
 
 %build
 export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb -o"
@@ -29,7 +31,11 @@ export IBUS_TABLE_CREATEDB="%{_bindir}/i
     --prefix=%{_prefix} \
     --enable-cangjie3 \
     --enable-cangjie5 \
-    --enable-cangjiebig
+    --enable-cangjiebig \
+    --enable-quick3 \
+    --enable-quick5 \
+    --enable-quickclassic \
+    --enable-easybig
 %__make %{?_smp_mflags}
 
 %install
@@ -44,18 +50,34 @@ cd %{_datadir}/ibus-table/tables/
 %{_bindir}/ibus-table-createdb -i -n cangjie3.db
 %{_bindir}/ibus-table-createdb -i -n cangjie5.db
 %{_bindir}/ibus-table-createdb -i -n cangjie-big.db
+%{_bindir}/ibus-table-createdb -i -n quick3.db
+%{_bindir}/ibus-table-createdb -i -n quick5.db
+%{_bindir}/ibus-table-createdb -i -n quick-classic.db
+%{_bindir}/ibus-table-createdb -i -n easy-big.db
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS icons/COPYING.icons tables/COPYING.tables README
+%doc AUTHORS COPYING README
 %verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjie3.db
 %verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjie5.db
 %verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjie-big.db
+%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick3.db
+%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick5.db
+%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick-classic.db
+%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/easy-big.db
 %{_datadir}/ibus-table/icons/cangjie3.svg
 %{_datadir}/ibus-table/icons/cangjie5.svg
 %{_datadir}/ibus-table/icons/cangjie-big.png
+%{_datadir}/ibus-table/icons/quick3.png
+%{_datadir}/ibus-table/icons/quick5.png
+%{_datadir}/ibus-table/icons/quick-classic.png
+%{_datadir}/ibus-table/icons/easy-big.png
 
 %changelog
+* Wed Jan 06 2010 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20100106-1.fc13
+- Combined CangJie3, CangJie5, CangJie Big, Quick3, Quick5, Quick Classic, 
+  Easy Big into ibus-table-cangjie.
+
 * Mon Aug 31 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090831-2.fc12
 - Typo in file section.