Hello community, here is the log from the commit of package ibus-table for openSUSE:Factory checked in at 2014-07-29 16:48:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-table (Old) and /work/SRC/openSUSE:Factory/.ibus-table.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-table" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-table/ibus-table.changes 2014-07-04 09:35:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ibus-table.new/ibus-table.changes 2014-07-29 16:48:16.000000000 +0200 @@ -2 +2,21 @@ -Fri Jul 4 12:04:17 CST 2014 - hillw...@linuxfans.org +Sat Jul 26 16:14:01 UTC 2014 - i...@marguerite.su + +- update version 1.8.5 + * Always write xml output in UTF-8 encoding, not in the encoding + of the current locale +- changes since 1.8.4 + * Tweak defaults for Chinese mode taken from the locale + * Fix prompts for array30 table and don’t use prompts in pinyin mode + * Make it possible to use select keys like F1, F2, F3 ... + * For cangjie* and quick* tables: Use big5 order if the freq from + the table is the same +- add ibus-table-python3.patch + * replace file() to open() + +------------------------------------------------------------------- +Sat Jul 26 10:37:47 UTC 2014 - hillw...@linuxfans.org + +- Switch python to python3 + +------------------------------------------------------------------- +Fri Jul 4 04:04:17 UTC 2014 - hillw...@linuxfans.org @@ -37 +57 @@ -Mon Jul 8 09:29:42 CST 2013 - hillw...@linuxfans.org +Mon Jul 8 01:29:42 UTC 2013 - hillw...@linuxfans.org @@ -44 +64 @@ -Wed Jan 13 18:44:31 CST 2013 - hillw...@linuxfans.org +Wed Jan 13 10:44:31 UTC 2013 - hillw...@linuxfans.org @@ -49 +69 @@ -Wed Dec 19 20:26:07 CST 2012 - hillw...@linuxfans.org +Wed Dec 19 12:26:07 UTC 2012 - hillw...@linuxfans.org @@ -55 +75 @@ -Wed Oct 12 22:04:03 CST 2012 - hillw...@linuxfans.org +Wed Oct 12 14:04:03 UTC 2012 - hillw...@linuxfans.org @@ -62 +82 @@ -Wed Oct 3 16:45:03 CST 2012 - hillw...@linuxfans.org +Wed Oct 3 08:45:03 UTC 2012 - hillw...@linuxfans.org @@ -67 +87 @@ -Fri Sep 7 09:50:18 CST 2012 - hillw...@linuxfans.org +Fri Sep 7 01:50:18 UTC 2012 - hillw...@linuxfans.org @@ -78 +98 @@ -Mon Jun 18 18:58:17 CST 2012 - hillw...@linuxfans.org +Mon Jun 18 10:58:17 UTC 2012 - hillw...@linuxfans.org Old: ---- ibus-table-1.8.3.tar.gz New: ---- ibus-table-1.8.5.tar.gz ibus-table-python3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-table.spec ++++++ --- /var/tmp/diff_new_pack.sakDpr/_old 2014-07-29 16:48:17.000000000 +0200 +++ /var/tmp/diff_new_pack.sakDpr/_new 2014-07-29 16:48:17.000000000 +0200 @@ -17,20 +17,24 @@ Name: ibus-table -BuildRequires: fdupes -BuildRequires: ibus-devel >= 1.4.99 -BuildRequires: pkgconfig -BuildRequires: python -Version: 1.8.3 +Version: 1.8.5 Release: 0 Summary: The Table engine for IBus platform License: LGPL-2.1+ Group: System/I18n/Chinese -Url: http://code.google.com/p/ibus/ -Source: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Url: https://github.com/mike-fabian/ibus-table/ +Source: https://mfabian.fedorapeople.org/%{name}/%{name}-%{version}.tar.gz +#PATCH-FIX-UPSTREAM marguer...@opensuse.org +# replace file() to open() +Patch: ibus-table-python3.patch +BuildRequires: fdupes +BuildRequires: ibus-devel >= 1.4.99 +BuildRequires: pkg-config +BuildRequires: python3-devel Requires: ibus >= 1.4.99 -Requires: python-curses +Requires: python3 +Requires: python3-curses +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The package contains general Table engine for IBus platform. @@ -38,39 +42,42 @@ %package devel Summary: Development package for ibus-table Group: Development/Libraries/Other -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %description devel This package contains the files required for the development of ibus-table. %prep %setup -q +%patch -p1 chmod -x AUTHORS COPYING README %build +export PYTHON=python3 %configure \ - --disable-static --libexecdir=%{_prefix}/%{_lib}/ibus -make %{?jobs:-j %jobs} + --disable-static \ + --libexecdir=%{_libdir}/ibus +make %{?_smp_mflags} %install -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} %find_lang %{name} -%fdupes -s $RPM_BUILD_ROOT +%fdupes %{buildroot} %files -f %{name}.lang -%defattr(-,root,root,-) +%defattr(-,root,root) %doc AUTHORS COPYING README -%{_datadir}/ibus-table -%dir %{_libdir}/ibus -%{_libdir}/ibus/ibus-* -%{_bindir}/* -%{_datadir}/ibus -%{_mandir}/man1/* +%{_bindir}/%{name}-createdb +%{_ibus_libdir}/ibus-engine-table +%{_ibus_libdir}/ibus-setup-table %{_datadir}/applications/ibus-setup-table.desktop +%{_datadir}/%{name} +%{_ibus_componentdir}/table.xml +%{_mandir}/man1/%{name}-createdb.1.gz %files devel -%defattr(-,root,root,-) -%{_libdir}/pkgconfig/*.pc +%defattr(-,root,root) +%{_libdir}/pkgconfig/%{name}.pc %changelog ++++++ ibus-table-1.8.3.tar.gz -> ibus-table-1.8.5.tar.gz ++++++ ++++ 1963 lines of diff (skipped) ++++++ ibus-table-python3.patch ++++++ Index: ibus-table-1.8.5/engine/tabcreatedb.py =================================================================== --- ibus-table-1.8.5.orig/engine/tabcreatedb.py +++ ibus-table-1.8.5/engine/tabcreatedb.py @@ -358,7 +358,7 @@ def main (): if _bz2p: extra_s = bz2.BZ2File ( opts.extra, "r" ) else: - extra_s = file ( opts.extra, 'r' ) + extra_s = open ( opts.extra, 'r', encoding="utf-8" ) debug_print ('\tParsing extra words source file ') extraline = parse_extra (extra_s) debug_print ('\tPreparing extra words lines') @@ -375,7 +375,7 @@ def main (): extra_phrases.update({"%s\t%s" %(x[0],x[1]):x}) debug_print ( '\t the len of extra_phrases is: %d' % len(extra_phrases) ) # pop duplicated keys - for x in extra_phrases: + for x in list(extra_phrases): if x in orig_phrases: extra_phrases.pop(x) debug_print( '\t %d extra phrases will be added' % len(extra_phrases)) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
