Accepting request 557219 from M17N

(forwarded request 557218 from hillwood)

OBS-URL: https://build.opensuse.org/request/show/557219
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ibus-table?expand=0&rev=23
This commit is contained in:
2017-12-19 09:56:43 +00:00
committed by Git OBS Bridge
5 changed files with 45 additions and 39 deletions

View File

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

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

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

View File

@@ -1,22 +0,0 @@
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))

View File

@@ -1,3 +1,25 @@
-------------------------------------------------------------------
Fri Dec 15 04:27:29 UTC 2017 - hillwood@opensuse.org
- Update to 1.9.17. This update will fix boo#939462
* Load .desktop file for ibus-setup-table correctly under Gnome Wayland
* Set WM_CLASS of ibus-setup-table correctly
* Avoid running initialization code of ibus_table_location.py
* when using ibus-table-createdb.
* Make it work on Python 3.6 (Unbreak sqlite on Python 3.6)
* (Resolves: rhbz#1413580).
* Update translations from zanata (ca, de, fr, uk updated)
* Point to new home-page in the “About” tab.
* Improve README
* Fix bug in Unihan_Variants.txt, 乾 U+4E7E is both simplified and traditional
Chinese (thanks to Heiher r@hev.cc)
* When ignoring key release events, “False” should be returned, not “True”
* Resolves: Resolves: rhbz#1369514
* add ibus-table.appdata.xml and make it translatable
* pull some new translations and updates from Zanata (ca, fr, pt_BR, and uk
are new, ja, zh_CN, and zh_TW have updates).
- Drop ibus-table-python3.patch, It is needless.
-------------------------------------------------------------------
Sun Sep 28 23:10:37 PRC 2014 - hillwood@linuxfans.org

View File

@@ -1,7 +1,7 @@
#
# spec file for package ibus-table
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,20 +17,23 @@
Name: ibus-table
Version: 1.8.11
Version: 1.9.17
Release: 0
Summary: The Table engine for IBus platform
License: LGPL-2.1+
Group: System/I18n/Chinese
Url: https://github.com/mike-fabian/ibus-table/
Source: https://mfabian.fedorapeople.org/%{name}/%{name}-%{version}.tar.gz
#PATCH-FIX-UPSTREAM marguerite@opensuse.org
Source: https://github.com/mike-fabian/ibus-table/archive/%{version}/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM marguerite@opensuse.org
# replace file() to open()
Patch: ibus-table-python3.patch
# Patch: ibus-table-python3.patch
BuildRequires: docbook-utils-minimal
BuildRequires: fdupes
BuildRequires: ibus-devel >= 1.4.99
BuildRequires: gettext-tools
BuildRequires: gnome-common
BuildRequires: pkg-config
BuildRequires: python3-devel
BuildRequires: pkgconfig(ibus-1.0)
BuildRequires: pkgconfig(python3)
Requires: ibus >= 1.4.99
Requires: python3
Requires: python3-curses
@@ -49,25 +52,27 @@ This package contains the files required for the development of ibus-table.
%prep
%setup -q
%patch -p1
# %patch -p1
chmod -x AUTHORS COPYING README
%build
export PYTHON=python3
%configure \
--disable-static \
--libexecdir=%{_libdir}/ibus
NOCONFIGURE=1 ./autogen.sh
%configure --disable-static \
--enable-additional \
--libexecdir=%{_libdir}/ibus
make %{?_smp_mflags}
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install
%find_lang %{name}
%fdupes %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING README
%defattr(-,root,root,-)
%doc AUTHORS COPYING README NEWS ChangeLog
%{_bindir}/%{name}-createdb
%{_ibus_libdir}/ibus-engine-table
%{_ibus_libdir}/ibus-setup-table
@@ -75,6 +80,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
%{_datadir}/%{name}
%{_ibus_componentdir}/table.xml
%{_mandir}/man1/%{name}-createdb.1.gz
%{_datadir}/appdata/ibus-table.appdata.xml
%files devel
%defattr(-,root,root)