From cdb0a9c764942376b10d464882825323c35b1b6011b2febdc89cd55608c65d2d Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sat, 26 Jul 2014 10:46:55 +0000 Subject: [PATCH 1/5] Accepting request 242470 from home:hillwood:branches:M17N - Switch python to python3 OBS-URL: https://build.opensuse.org/request/show/242470 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus-table?expand=0&rev=28 --- ibus-table.changes | 5 +++++ ibus-table.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ibus-table.changes b/ibus-table.changes index 7a0a160..a6c6b6a 100644 --- a/ibus-table.changes +++ b/ibus-table.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 26 12:04:17 CST 2014 - hillwood@linuxfans.org + +- Switch python to python3 + ------------------------------------------------------------------- Fri Jul 4 12:04:17 CST 2014 - hillwood@linuxfans.org diff --git a/ibus-table.spec b/ibus-table.spec index 0817350..47e10df 100644 --- a/ibus-table.spec +++ b/ibus-table.spec @@ -30,7 +30,10 @@ Url: http://code.google.com/p/ibus/ Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: ibus >= 1.4.99 -Requires: python-curses +Requires: python3 +Requires: python3-curses +BuildRequires: ibus-devel > 1.4.99 +BuildRequires: python3-devel %description The package contains general Table engine for IBus platform. @@ -48,6 +51,7 @@ This package contains the files required for the development of ibus-table. chmod -x AUTHORS COPYING README %build +export PYTHON=python3 %configure \ --disable-static --libexecdir=%{_prefix}/%{_lib}/ibus make %{?jobs:-j %jobs} From a57f7eba3deb8dabc2c403a6e82286cebd4db29c70b09b43173f8393062dcd97 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sat, 26 Jul 2014 11:25:37 +0000 Subject: [PATCH 2/5] Accepting request 242474 from home:hillwood:branches:M17N OBS-URL: https://build.opensuse.org/request/show/242474 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus-table?expand=0&rev=29 --- ibus-table.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibus-table.changes b/ibus-table.changes index a6c6b6a..46775ac 100644 --- a/ibus-table.changes +++ b/ibus-table.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri Jul 26 12:04:17 CST 2014 - hillwood@linuxfans.org +Sat Jul 26 18:37:47 CST 2014 - hillwood@linuxfans.org - Switch python to python3 From 60a770ac00274cb871425ce018526f25fd83c43bc1d9af33db5f149fbaa439b1 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sun, 27 Jul 2014 07:47:02 +0000 Subject: [PATCH 3/5] Accepting request 242567 from home:hillwood:branches:M17N Fix timezone in changlog OBS-URL: https://build.opensuse.org/request/show/242567 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus-table?expand=0&rev=30 --- ibus-table.changes | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ibus-table.changes b/ibus-table.changes index 46775ac..1546102 100644 --- a/ibus-table.changes +++ b/ibus-table.changes @@ -1,10 +1,10 @@ ------------------------------------------------------------------- -Sat Jul 26 18:37:47 CST 2014 - hillwood@linuxfans.org +Sat Jul 26 18:37:47 Chongqing 2014 - hillwood@linuxfans.org - Switch python to python3 ------------------------------------------------------------------- -Fri Jul 4 12:04:17 CST 2014 - hillwood@linuxfans.org +Fri Jul 4 12:04:17 Chongqing 2014 - hillwood@linuxfans.org - Updateto 1.8.3, ibus-table >= 1.8.x has many improvements over 1.5.x * The database format is simplified which makes better matching @@ -39,37 +39,37 @@ Sun Dec 15 09:37:48 UTC 2013 - swyear@gmail.com but it is not installed in some system, e.g Live KDE ------------------------------------------------------------------- -Mon Jul 8 09:29:42 CST 2013 - hillwood@linuxfans.org +Mon Jul 8 09:29:42 Chongqing 2013 - hillwood@linuxfans.org - Update to 1.5.0 * Updated PO files. * Make page up/down keys configurable ------------------------------------------------------------------- -Wed Jan 13 18:44:31 CST 2013 - hillwood@linuxfans.org +Wed Jan 13 18:44:31 Chongqing 2013 - hillwood@linuxfans.org - fix bnc#803488 ------------------------------------------------------------------- -Wed Dec 19 20:26:07 CST 2012 - hillwood@linuxfans.org +Wed Dec 19 20:26:07 Chongqing 2012 - hillwood@linuxfans.org - Update to 1.4.99.20121112 * Updated PO files ------------------------------------------------------------------- -Wed Oct 12 22:04:03 CST 2012 - hillwood@linuxfans.org +Wed Oct 12 22:04:03 Chongqing 2012 - hillwood@linuxfans.org - Update to 1.4.99.20121012 * Updated PO files. * Merge remote-tracking branch 'mozbugbox/page-up-down-config' into ------------------------------------------------------------------- -Wed Oct 3 16:45:03 CST 2012 - hillwood@linuxfans.org +Wed Oct 3 16:45:03 Chongqing 2012 - hillwood@linuxfans.org - update to 1.4.99.20121003, upstream did not provide more information. ------------------------------------------------------------------- -Fri Sep 7 09:50:18 CST 2012 - hillwood@linuxfans.org +Fri Sep 7 09:50:18 Chongqing 2012 - hillwood@linuxfans.org - update to 1.4.99.20120904 Package Maintainer: Please test before include this to your distro. @@ -80,7 +80,7 @@ Wed Jul 4 13:15:33 UTC 2012 - swyear@gmail.com - Add ibus as Requires ------------------------------------------------------------------- -Mon Jun 18 18:58:17 CST 2012 - hillwood@linuxfans.org +Mon Jun 18 18:58:17 Chongqing 2012 - hillwood@linuxfans.org - update to 1.3.9.20110827 - better compatibility for ibus 1.4 From 2eabe9d2a8635d492e8c972388cd96cc25061bdecf4feae869bf5d349a408543 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sun, 27 Jul 2014 12:43:28 +0000 Subject: [PATCH 4/5] Accepting request 242585 from home:MargueriteSu:branches:M17N fix python3, it breaks almost all of the ibus-table* packages. OBS-URL: https://build.opensuse.org/request/show/242585 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus-table?expand=0&rev=31 --- ibus-table-1.8.3.tar.gz | 3 --- ibus-table-1.8.5.tar.gz | 3 +++ ibus-table-python3.patch | 22 +++++++++++++++++ ibus-table.changes | 33 +++++++++++++++++++------- ibus-table.spec | 51 +++++++++++++++++++++------------------- 5 files changed, 76 insertions(+), 36 deletions(-) delete mode 100644 ibus-table-1.8.3.tar.gz create mode 100644 ibus-table-1.8.5.tar.gz create mode 100644 ibus-table-python3.patch diff --git a/ibus-table-1.8.3.tar.gz b/ibus-table-1.8.3.tar.gz deleted file mode 100644 index 6cd01eb..0000000 --- a/ibus-table-1.8.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:152723f65ad4f0544fee129938404c6cc0619a1da25f59f81a733da8d8c2dfc4 -size 523413 diff --git a/ibus-table-1.8.5.tar.gz b/ibus-table-1.8.5.tar.gz new file mode 100644 index 0000000..92bfb13 --- /dev/null +++ b/ibus-table-1.8.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a63b8dad3f98bef3bb321d6a22742286b1652c9da11a1ba738a89d4a53d78a19 +size 527157 diff --git a/ibus-table-python3.patch b/ibus-table-python3.patch new file mode 100644 index 0000000..dc5309d --- /dev/null +++ b/ibus-table-python3.patch @@ -0,0 +1,22 @@ +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)) diff --git a/ibus-table.changes b/ibus-table.changes index 1546102..f0198d7 100644 --- a/ibus-table.changes +++ b/ibus-table.changes @@ -1,10 +1,25 @@ ------------------------------------------------------------------- -Sat Jul 26 18:37:47 Chongqing 2014 - hillwood@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 - hillwood@linuxfans.org - Switch python to python3 ------------------------------------------------------------------- -Fri Jul 4 12:04:17 Chongqing 2014 - hillwood@linuxfans.org +Fri Jul 4 12:04:17 CST 2014 - hillwood@linuxfans.org - Updateto 1.8.3, ibus-table >= 1.8.x has many improvements over 1.5.x * The database format is simplified which makes better matching @@ -39,37 +54,37 @@ Sun Dec 15 09:37:48 UTC 2013 - swyear@gmail.com but it is not installed in some system, e.g Live KDE ------------------------------------------------------------------- -Mon Jul 8 09:29:42 Chongqing 2013 - hillwood@linuxfans.org +Mon Jul 8 09:29:42 CST 2013 - hillwood@linuxfans.org - Update to 1.5.0 * Updated PO files. * Make page up/down keys configurable ------------------------------------------------------------------- -Wed Jan 13 18:44:31 Chongqing 2013 - hillwood@linuxfans.org +Wed Jan 13 18:44:31 CST 2013 - hillwood@linuxfans.org - fix bnc#803488 ------------------------------------------------------------------- -Wed Dec 19 20:26:07 Chongqing 2012 - hillwood@linuxfans.org +Wed Dec 19 20:26:07 CST 2012 - hillwood@linuxfans.org - Update to 1.4.99.20121112 * Updated PO files ------------------------------------------------------------------- -Wed Oct 12 22:04:03 Chongqing 2012 - hillwood@linuxfans.org +Wed Oct 12 22:04:03 CST 2012 - hillwood@linuxfans.org - Update to 1.4.99.20121012 * Updated PO files. * Merge remote-tracking branch 'mozbugbox/page-up-down-config' into ------------------------------------------------------------------- -Wed Oct 3 16:45:03 Chongqing 2012 - hillwood@linuxfans.org +Wed Oct 3 16:45:03 CST 2012 - hillwood@linuxfans.org - update to 1.4.99.20121003, upstream did not provide more information. ------------------------------------------------------------------- -Fri Sep 7 09:50:18 Chongqing 2012 - hillwood@linuxfans.org +Fri Sep 7 09:50:18 CST 2012 - hillwood@linuxfans.org - update to 1.4.99.20120904 Package Maintainer: Please test before include this to your distro. @@ -80,7 +95,7 @@ Wed Jul 4 13:15:33 UTC 2012 - swyear@gmail.com - Add ibus as Requires ------------------------------------------------------------------- -Mon Jun 18 18:58:17 Chongqing 2012 - hillwood@linuxfans.org +Mon Jun 18 18:58:17 CST 2012 - hillwood@linuxfans.org - update to 1.3.9.20110827 - better compatibility for ibus 1.4 diff --git a/ibus-table.spec b/ibus-table.spec index 47e10df..d86749b 100644 --- a/ibus-table.spec +++ b/ibus-table.spec @@ -17,23 +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 marguerite@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: python3 Requires: python3-curses -BuildRequires: ibus-devel > 1.4.99 -BuildRequires: python3-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The package contains general Table engine for IBus platform. @@ -41,40 +42,42 @@ The package contains general Table engine for IBus platform. %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 From ac0c3f9c3d85f43739f988af0764215eb548018cb535c3e9b2a521370a506526 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sun, 27 Jul 2014 15:52:44 +0000 Subject: [PATCH 5/5] Accepting request 242610 from home:MargueriteSu:branches:M17N fix timestamps OBS-URL: https://build.opensuse.org/request/show/242610 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus-table?expand=0&rev=32 --- ibus-table.changes | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ibus-table.changes b/ibus-table.changes index f0198d7..c70fc35 100644 --- a/ibus-table.changes +++ b/ibus-table.changes @@ -19,7 +19,7 @@ Sat Jul 26 10:37:47 UTC 2014 - hillwood@linuxfans.org - Switch python to python3 ------------------------------------------------------------------- -Fri Jul 4 12:04:17 CST 2014 - hillwood@linuxfans.org +Fri Jul 4 04:04:17 UTC 2014 - hillwood@linuxfans.org - Updateto 1.8.3, ibus-table >= 1.8.x has many improvements over 1.5.x * The database format is simplified which makes better matching @@ -54,37 +54,37 @@ Sun Dec 15 09:37:48 UTC 2013 - swyear@gmail.com but it is not installed in some system, e.g Live KDE ------------------------------------------------------------------- -Mon Jul 8 09:29:42 CST 2013 - hillwood@linuxfans.org +Mon Jul 8 01:29:42 UTC 2013 - hillwood@linuxfans.org - Update to 1.5.0 * Updated PO files. * Make page up/down keys configurable ------------------------------------------------------------------- -Wed Jan 13 18:44:31 CST 2013 - hillwood@linuxfans.org +Wed Jan 13 10:44:31 UTC 2013 - hillwood@linuxfans.org - fix bnc#803488 ------------------------------------------------------------------- -Wed Dec 19 20:26:07 CST 2012 - hillwood@linuxfans.org +Wed Dec 19 12:26:07 UTC 2012 - hillwood@linuxfans.org - Update to 1.4.99.20121112 * Updated PO files ------------------------------------------------------------------- -Wed Oct 12 22:04:03 CST 2012 - hillwood@linuxfans.org +Wed Oct 12 14:04:03 UTC 2012 - hillwood@linuxfans.org - Update to 1.4.99.20121012 * Updated PO files. * Merge remote-tracking branch 'mozbugbox/page-up-down-config' into ------------------------------------------------------------------- -Wed Oct 3 16:45:03 CST 2012 - hillwood@linuxfans.org +Wed Oct 3 08:45:03 UTC 2012 - hillwood@linuxfans.org - update to 1.4.99.20121003, upstream did not provide more information. ------------------------------------------------------------------- -Fri Sep 7 09:50:18 CST 2012 - hillwood@linuxfans.org +Fri Sep 7 01:50:18 UTC 2012 - hillwood@linuxfans.org - update to 1.4.99.20120904 Package Maintainer: Please test before include this to your distro. @@ -95,7 +95,7 @@ Wed Jul 4 13:15:33 UTC 2012 - swyear@gmail.com - Add ibus as Requires ------------------------------------------------------------------- -Mon Jun 18 18:58:17 CST 2012 - hillwood@linuxfans.org +Mon Jun 18 10:58:17 UTC 2012 - hillwood@linuxfans.org - update to 1.3.9.20110827 - better compatibility for ibus 1.4