pool/ibus-table
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 242585 from home:MargueriteSu:branches:M17N

Browse Source 
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
This commit is contained in:
Marguerite Su 2014-07-27 12:43:28 +00:00 committed by Git OBS Bridge
parent 60a770ac00
commit 2eabe9d2a8
5 changed files with 76 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ibus-table-1.8.3.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:152723f65ad4f0544fee129938404c6cc0619a1da25f59f81a733da8d8c2dfc4
size 523413

3
ibus-table-1.8.5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a63b8dad3f98bef3bb321d6a22742286b1652c9da11a1ba738a89d4a53d78a19
size 527157

22
ibus-table-python3.patch Normal file
View File

@ -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))

33
ibus-table.changes
View File

@ -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

51
ibus-table.spec
View File

@ -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