rpms/ibus-table/F-10 ibus-table-1.1.0.20090316-1.bz490396.no_speedmeter.patch, NONE, 1.1 ibus-table-pkgconfig-noarch.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 ibus-table.spec, 1.4, 1.5 sources, 1.5, 1.6

Mon Apr 27 07:09:20 UTC 2009

Author: phuang

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

Modified Files:
	.cvsignore ibus-table.spec sources 
Added Files:
	ibus-table-1.1.0.20090316-1.bz490396.no_speedmeter.patch 
	ibus-table-pkgconfig-noarch.patch 
Log Message:
Port F-11 branch to F-10

ibus-table-1.1.0.20090316-1.bz490396.no_speedmeter.patch:

--- NEW FILE ibus-table-1.1.0.20090316-1.bz490396.no_speedmeter.patch ---
diff -up ibus-table-1.1.0.20090316/engine/ibus-engine-table.in.orig ibus-table-1.1.0.20090316/engine/ibus-engine-table.in
--- ibus-table-1.1.0.20090316/engine/ibus-engine-table.in.orig	2009-03-16 15:11:57.000000000 +1000
+++ ibus-table-1.1.0.20090316/engine/ibus-engine-table.in	2009-03-16 15:12:41.000000000 +1000
@@ -35,7 +35,8 @@ for arg in $@; do
 done
 
 # first running speedmeter as a daemon
-python @datarootdir@/ibus-table/engine/speedmeter.py -d
+# (temporary disabled until config option is implemented)
+#python @datarootdir@/ibus-table/engine/speedmeter.py -d
 
 # then start our IME
 exec python @datarootdir@/ibus-table/engine/main.py $@

ibus-table-pkgconfig-noarch.patch:

--- NEW FILE ibus-table-pkgconfig-noarch.patch ---
diff -u ibus-table-1.1.0.20090220/ibus-table.pc.in\~ ibus-table-1.1.0.20090220/ibus-table.pc.in
--- ibus-table-1.1.0.20090220/ibus-table.pc.in~	2009-02-20 11:42:40.000000000 +1000
+++ ibus-table-1.1.0.20090220/ibus-table.pc.in	2009-03-06 11:45:18.001898774 +1000
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@
+libdir=@datadir@
 datarootdir=@datarootdir@
 datadir=@datadir@
 

Diff finished.  Fri Mar  6 11:46:24 2009


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Oct 2008 07:33:53 -0000	1.5
+++ .cvsignore	27 Apr 2009 07:08:50 -0000	1.6
@@ -1 +1 @@
-ibus-table-0.1.1.20081014.tar.gz
+ibus-table-1.1.0.20090316.tar.gz


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-10/ibus-table.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ibus-table.spec	17 Oct 2008 07:33:53 -0000	1.4
+++ ibus-table.spec	27 Apr 2009 07:08:50 -0000	1.5
@@ -1,32 +1,22 @@
 Name:       ibus-table
-Version:    0.1.1.20081014
+Version:    1.1.0.20090316 
 Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
-License:    GPLv2+
+License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
-
-BuildRequires:  gettext-devel
-
-Requires:   ibus
+BuildRequires:  ibus-devel > 1.1.0
+Requires:   ibus > 1.1.0
+Patch1:     ibus-table-1.1.0.20090316-1.bz490396.no_speedmeter.patch 
 
 %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.
+Summary:    Additional tables for general table engine of IBus
 Group:      System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
 
@@ -35,36 +25,21 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-bz490396.no_speedmeter
 
 %build
-%configure \
-	--disable-static \
-	--enable-zhengma \
-	--enable-wubi86 \
-	--enable-wubi98 \
-	--enable-cangjie5 \
-	--enable-erbi-qs \
-	--enable-additional
-#	--enable-extra-phrases
-
+%configure --disable-static --enable-additional
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install
+make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install pkgconfigdir=%{_datadir}/pkgconfig
 
 %find_lang %{name}
 
 %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
@@ -72,54 +47,104 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%{_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
+%{_datadir}/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 16 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090316-1.fc11
+- Resolves: rhbz#490396
+- Updated source tarball.
+- Disabled speedmeter until config option is implemented.
+
+* Fri Mar  6 2009 Jens Petersen <petersen at redhat.com> - 1.1.0.20090220-5
+- make pkgconfig noarch with ibus-table-pkgconfig-noarch.patch
+- fix license field: actually LGPL
+- drop gettext-devel BR
+- require ibus > 1.1.0
+
+* Mon Mar 02 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090220-4.fc11
+- Rebuilt.
+
+* Mon Mar 02 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090220-3.fc11
+- Rebuilt.
+
+* Mon Mar 02 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090220-2.fc11
+- Rebuilt.
+
+* Mon Mar 02 2009 Caius Chance <cchance at 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 at lists.fedoraproject.org> - 0.1.1.20081014-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 04 2009 Caius Chance <cchance at redhat.com> - 0.1.1.20081014-4
+- Resolves: rhbz#466430 rhbz#466844
+- Added wildcard features.
+- Added preedit clearance on refocus.
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.1.20081014-3
+- Rebuild for Python 2.6
+
+* Mon Dec 1 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081014-2
+- Modified spec file to own all directories created by ibus-table.
+
 * Fri Oct 14 2008 Peng Huang <shawn.p.huang at gmail.com> - 0.1.1.20081014-1
 - Update to 0.1.1.20081014.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Oct 2008 07:33:53 -0000	1.5
+++ sources	27 Apr 2009 07:08:50 -0000	1.6
@@ -1 +1 @@
-8c72c6ec97a0dcc822784e42ed6625c8  ibus-table-0.1.1.20081014.tar.gz
+f512ac6bd166c68c8308a255fcd77d48  ibus-table-1.1.0.20090316.tar.gz


