Hello community,
here is the log from the commit of package ibus-table for openSUSE:Factory
checked in at Tue Jun 28 11:06:18 CEST 2011.
--------
--- ibus-table/ibus-table.changes 2010-03-24 14:22:20.000000000 +0100
+++ /mounts/work_src_done/STABLE/ibus-table/ibus-table.changes 2011-06-28 10:16:16.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Jun 14 04:08:47 UTC 2011 - swyear@gmail.com
+
+- Update to 1.3.0;
+ major update for ibus-1.3.x infrastructure
+- additional had move to package ibus-table-others
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
ibus-table-1.2.0.20091113.tar.gz
New:
----
ibus-table-1.3.0.20100621.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ibus-table.spec ++++++
--- /var/tmp/diff_new_pack.8If7UM/_old 2011-06-28 11:05:01.000000000 +0200
+++ /var/tmp/diff_new_pack.8If7UM/_new 2011-06-28 11:05:01.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package ibus-table (Version 1.2.0.20091113)
+# spec file for package ibus-table
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,11 +20,11 @@
Name: ibus-table
BuildRequires: fdupes ibus-devel pkgconfig python
-Version: 1.2.0.20091113
-Release: 2
+Version: 1.3.0.20100621
+Release: 1
Summary: The Table engine for IBus platform
License: LGPLv2.1+
-Group: System Environment/Libraries
+Group: System/I18n/Chinese
Url: http://code.google.com/p/ibus/
Source: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -35,28 +35,19 @@
%package devel
License: LGPLv2.1+
Summary: Development package for ibus-table
-Group: System Environment/Libraries
+Group: Development/Libraries/other
Requires: %{name} = %{version}-%{release}
%description devel
This package contains the files required for the development of ibus-table.
-%package additional
-License: LGPLv2.1+
-Summary: Additional tables for general table engine of IBus
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description additional
-This package contains additional tables.
-
%prep
%setup -q
+chmod -x AUTHORS COPYING README
%build
%configure \
- --disable-static \
- --enable-additional
+ --disable-static --libexecdir=%{_prefix}/%{_lib}/ibus
make %{?jobs:-j %jobs}
%install
@@ -68,29 +59,17 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post additional
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/compose.db
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/latex.db
-
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_datadir}/ibus-table
-%{_libexecdir}/ibus-*
+%dir %{_libdir}/ibus
+%{_libdir}/ibus/ibus-*
%{_bindir}/*
%{_datadir}/ibus
-%exclude %{_datadir}/ibus-table/*/compose.*
-%exclude %{_datadir}/ibus-table/*/latex.*
%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/*.pc
-%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
-
%changelog
++++++ ibus-table-1.2.0.20091113.tar.gz -> ibus-table-1.3.0.20100621.tar.gz ++++++
++++ 9044 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-table-1.2.0.20091113/configure.ac new/ibus-table-1.3.0.20100621/configure.ac
--- old/ibus-table-1.2.0.20091113/configure.ac 2009-11-13 03:51:18.000000000 +0100
+++ new/ibus-table-1.3.0.20100621/configure.ac 2010-06-21 07:34:14.000000000 +0200
@@ -24,7 +24,7 @@
m4_define([package_name], [ibus-table])
m4_define([ibus_released], [0])
m4_define([ibus_major_version], [1])
-m4_define([ibus_minor_version], [2])
+m4_define([ibus_minor_version], [3])
m4_define([ibus_micro_version], [0])
m4_define(ibus_maybe_datestamp,
m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-table-1.2.0.20091113/engine/tabcreatedb.py new/ibus-table-1.3.0.20100621/engine/tabcreatedb.py
--- old/ibus-table-1.2.0.20091113/engine/tabcreatedb.py 2009-11-13 03:51:18.000000000 +0100
+++ new/ibus-table-1.3.0.20100621/engine/tabcreatedb.py 2010-05-11 08:55:40.000000000 +0200
@@ -161,7 +161,7 @@
def phrase_parser (f):
list=[]
for l in f:
- xingma, phrase, freq = unicode (l, "utf-8").strip ().split ('\t')
+ xingma, phrase, freq = unicode (l, "utf-8").strip ().split ('\t')[:3]
list.append ( (xingma, phrase, int(freq), 0) )
return list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-table-1.2.0.20091113/engine/table.py new/ibus-table-1.3.0.20100621/engine/table.py
--- old/ibus-table-1.2.0.20091113/engine/table.py 2009-11-13 03:51:18.000000000 +0100
+++ new/ibus-table-1.3.0.20100621/engine/table.py 2010-06-21 07:33:42.000000000 +0200
@@ -121,7 +121,7 @@
else:
return 1
else:
- if self.db._is_chinese():
+ if self.db._is_chinese:
# if IME declare as Chinese IME
return 0
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-table-1.2.0.20091113/engine/table.xml.in new/ibus-table-1.3.0.20100621/engine/table.xml.in
--- old/ibus-table-1.2.0.20091113/engine/table.xml.in 2009-11-13 03:51:49.000000000 +0100
+++ new/ibus-table-1.3.0.20100621/engine/table.xml.in 2010-06-21 07:34:41.000000000 +0200
@@ -4,7 +4,7 @@
<name>org.freedesktop.IBus.Table</name>
<description>Table Component</description>
<exec>${libexecdir}/ibus-engine-table --ibus</exec>
- <version>1.2.0.20091113</version>
+ <version>1.3.0.20100621</version>
<author>Yuwei Yu <acevery@gmail.com></author>
<license>LGPL</license>
<homepage>http://code.google.com/p/ibus</homepage>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-table-1.2.0.20091113/engine/tabsqlitedb.py new/ibus-table-1.3.0.20100621/engine/tabsqlitedb.py
--- old/ibus-table-1.2.0.20091113/engine/tabsqlitedb.py 2009-11-13 03:51:18.000000000 +0100
+++ new/ibus-table-1.3.0.20100621/engine/tabsqlitedb.py 2010-06-21 07:33:42.000000000 +0200
@@ -879,6 +879,7 @@
if p_len < 2:
# phrase should not be shorter than 2
return []
+ #print p_len
try:
if p_len >= self.rules['above']:
rule = self.rules[ self.rules['above'] ]
@@ -893,7 +894,8 @@
# zi -= 1
# gcm = self.get_gcm_id (phrase[zi])
# tabkeylist.append(gcm[ma-1])
- tabkeylist = map (lambda x: self.get_gcm_id ( phrase[x[0]-1] )[ x[1]-1 ], rule )
+ tabkeylist = map (lambda x: self.get_gcm_id ( phrase[x[0]-1 if x[0] > 0 else x[0]] )\
+ [ x[1]-1 if x[1] > 0 else x[1] ], rule )
return [len( tabkeylist)] + [p_len] + tabkeylist[:] + [phrase]
except:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ibus-table-1.2.0.20091113/ibus-table.spec new/ibus-table-1.3.0.20100621/ibus-table.spec
--- old/ibus-table-1.2.0.20091113/ibus-table.spec 2009-11-13 03:51:49.000000000 +0100
+++ new/ibus-table-1.3.0.20100621/ibus-table.spec 2010-06-21 07:34:41.000000000 +0200
@@ -1,5 +1,5 @@
Name: ibus-table
-Version: 1.2.0.20091113
+Version: 1.3.0.20100621
Release: 1%{?dist}
Summary: The Table engine for IBus platform
License: LGPLv2+
@@ -88,5 +88,5 @@
%{_datadir}/ibus/engine/latex.engine
%changelog
-* Wed Aug 19 2008 Yu Yuwei