rpms/ibus-table-cangjie/F-11 .cvsignore, 1.2, 1.3 ibus-table-cangjie.spec, 1.9, 1.10 sources, 1.2, 1.3

[cchance]

Author: cchance

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

Modified Files:
	.cvsignore ibus-table-cangjie.spec sources 
Log Message:
rebuilt w/ ibus 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-cangjie/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Mar 2009 01:25:53 -0000	1.2
+++ .cvsignore	30 Sep 2009 06:24:31 -0000	1.3
@@ -1 +1,2 @@
-ibus-table-cangjie-1.1.0.20090309.tar.gz
+ibus-table-quick-1.2.0.20090902.tar.gz
+ibus-table-cangjie-1.2.0.20090717.tar.gz


Index: ibus-table-cangjie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-cangjie/F-11/ibus-table-cangjie.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ibus-table-cangjie.spec	15 Jul 2009 06:16:46 -0000	1.9
+++ ibus-table-cangjie.spec	30 Sep 2009 06:24:31 -0000	1.10
@@ -1,42 +1,42 @@
 Name:       ibus-table-cangjie
-Version:    1.1.0.20090309
-Release:    13%{?dist}
-Summary:    Cang Jie input methods for ibus-table
+Version:    1.2.0.20090717
+Release:    1%{?dist}
+Summary:    CangJie table(s) for ibus-table
 License:    Public Domain and GPLv2+ 
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1:    COPYING.tables
+Source1:    http://ibus.googlecode.com/files/ibus-table-quick-1.2.0.20090902.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
 # for noarch pkgconfig
-Requires:   ibus >= 1.1.0.20090609, ibus-table >= 1.1.0.20090610
-Requires(post):   ibus >= 1.1.0.20090609, ibus-table >= 1.1.0.20090610
-BuildRequires: ibus >= 1.1.0.20090609, ibus-table >= 1.1.0.20090610
+Requires:   ibus >= 1.2, ibus-table >= 1.2
+BuildRequires: ibus >= 1.2, ibus-table >= 1.2
 BuildRequires:  gettext-devel >= 0.17, automake >= 1.10.1
 
 %description
-The package contains Cang Jie input methods for Table engine of IBus platform. 
+The package contains CangJie table for Table engine of IBus platform. 
 
 %prep
-%setup -q
-%__cp COPYING icons/COPYING.icons
-%__cp %{SOURCE1} tables/COPYING.tables
+%setup0 -q -b 0 -n %{name}-%{version}
+%setup1 -q -b 1 -n ibus-table-quick-1.2.0.20090902
 
 %build
 export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb -o"
-./autogen.sh \
-    --prefix=%{_prefix} \
-    --enable-cangjie5 \
-    --enable-cangjie3 \
-    --enable-quick5 \
-    --enable-quick3
+
+cd ../%{name}-%{version}
+./autogen.sh --prefix=%{_prefix} --enable-cangjie5 --enable-cangjie3
 %__make %{?_smp_mflags}
+cd ../ibus-table-quick-1.2.0.20090902/
+./autogen.sh --prefix=%{_prefix} --enable-quick5 --enable-quick3
 
 %install
 %__rm -rf %{buildroot}
+cd ../%{name}-%{version}
+make DESTDIR=%{buildroot} INSTALL="install -p" NO_INDEX=true install
+cd ../ibus-table-quick-1.2.0.20090902/
 make DESTDIR=%{buildroot} INSTALL="install -p" NO_INDEX=true install
 
 %clean
@@ -48,10 +48,11 @@ cd %{_datadir}/ibus-table/tables/
 %{_bindir}/ibus-table-createdb -i -n cangjie5.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
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS icons/COPYING.icons tables/COPYING.tables README
+%doc AUTHORS COPYING README
 %dir %{_datadir}/ibus-table
 %dir %{_datadir}/ibus-table/icons
 %dir %{_datadir}/ibus-table/tables
@@ -59,12 +60,17 @@ cd %{_datadir}/ibus-table/tables/
 %verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjie5.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
 %{_datadir}/ibus-table/icons/cangjie3.svg
 %{_datadir}/ibus-table/icons/cangjie5.svg
 %{_datadir}/ibus-table/icons/quick3.png
 %{_datadir}/ibus-table/icons/quick5.png
+%{_datadir}/ibus-table/icons/quick-classic.png
 
 %changelog
+* Wed Sep 30 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090717-1.fc11
+- Rebuilt for ibus 1.2.
+
 * Tue Jun 23 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.1.0.20090309-13.fc11
 - Refined macros.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-cangjie/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Mar 2009 01:25:54 -0000	1.2
+++ sources	30 Sep 2009 06:24:31 -0000	1.3
@@ -1 +1,2 @@
-21b4c23cd7c700330d7006d8c38f3b2e  ibus-table-cangjie-1.1.0.20090309.tar.gz
+488c33d4ae2b35aa82764cb746fe4cb4  ibus-table-quick-1.2.0.20090902.tar.gz
+c18db9f349ff92479c5528e1ea61fe79  ibus-table-cangjie-1.2.0.20090717.tar.gz