!6 Upgrade to version 1.17.2

From: @chen-jan 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
This commit is contained in:
openeuler-ci-bot 2023-09-01 09:01:34 +00:00 committed by Gitee
commit 89071caa3e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 19 additions and 52 deletions

View File

@ -1,49 +0,0 @@
From 7034f592314a79903c8ce5958de4deba2c13ae22 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Mon, 6 Jan 2020 19:09:56 +0100
Subject: [PATCH] Add exist_ok=True in os.makedirs(path, exist_ok=True) to
avoid failure due to race condition
Resolves: rhbz#1786652 (https://bugzilla.redhat.com/show_bug.cgi?id=1786652)
[abrt] ibus-table: makedirs(): os.py:221:makedirs:FileExistsError: [Errno 17] File exists: '/home/username/.local/share/ibus-table'
---
engine/ibus_table_location.py | 4 ++--
engine/tabsqlitedb.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/engine/ibus_table_location.py b/engine/ibus_table_location.py
index dee718d..036b372 100644
--- a/engine/ibus_table_location.py
+++ b/engine/ibus_table_location.py
@@ -73,7 +73,7 @@ def _init():
IBUS_TABLE_LOCATION['data_home'] = os.path.join(
IBUS_TABLE_LOCATION['data_home'], 'ibus-table')
if not os.access(IBUS_TABLE_LOCATION['data_home'], os.F_OK):
- os.makedirs(IBUS_TABLE_LOCATION['data_home'])
+ os.makedirs(IBUS_TABLE_LOCATION['data_home'], exist_ok=True)
# $XDG_CACHE_HOME defines the base directory relative to which user
# specific non-essential data files should be stored. If
@@ -89,7 +89,7 @@ def _init():
IBUS_TABLE_LOCATION['cache_home'] = os.path.join(
IBUS_TABLE_LOCATION['cache_home'], 'ibus-table')
if not os.access(IBUS_TABLE_LOCATION['cache_home'], os.F_OK):
- os.makedirs(IBUS_TABLE_LOCATION['cache_home'])
+ os.makedirs(IBUS_TABLE_LOCATION['cache_home'], exist_ok=True)
class __ModuleInitializer:
def __init__(self):
diff --git a/engine/tabsqlitedb.py b/engine/tabsqlitedb.py
index d9a8de2..60038a7 100644
--- a/engine/tabsqlitedb.py
+++ b/engine/tabsqlitedb.py
@@ -298,7 +298,7 @@ def __init__(
shutil.rmtree(old_tables_path)
os.symlink(tables_path, old_tables_path)
else:
- os.makedirs(tables_path)
+ os.makedirs(tables_path, exist_ok=True)
user_db = path.join(tables_path, user_db)
if not path.exists(user_db):
sys.stderr.write(

BIN
ibus-table-1.17.2.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,14 +1,16 @@
Name: ibus-table
Version: 1.9.21
Release: 6
Version: 1.17.2
Release: 1
Summary: Table engine for Intelligent Input Bus (IBus)
License: LGPLv2+
URL: https://github.com/kaio/ibus-table/
Source0: http://github.com/kaio/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
Patch0000: Add-exist_ok-True-in-os-makedirs-to-avoid-failure-due-to-race-condition.patch
BuildArch: noarch
BuildRequires: ibus-devel > 1.3.0, python3-devel, libappstream-glib
BuildRequires: gcc docbook-utils appstream desktop-file-utils python3-gobject
BuildRequires: python3-gobject-base dbus-x11 xorg-x11-server-Xvfb make
BuildRequires: ibus-table-chinese-wubi-jidian ibus-table-chinese-cangjie ibus-table-chinese-stroke5
Requires: ibus > 1.3.0, python3 >= 3.3
Obsoletes: ibus-table-additional < 1.2.0.20100111-5
@ -42,6 +44,8 @@ export PYTHON=%{__python3}
%install
export PYTHON=%{__python3}
%make_install NO_INDEX=true pkgconfigdir=%{_datadir}/pkgconfig
%py_byte_compile %{__python3} %{buildroot}/usr/share/ibus-table/engine
%py_byte_compile %{__python3} %{buildroot}/usr/share/ibus-table/setup
%find_lang %{name}
@ -79,6 +83,15 @@ make check || cat ./tests/test-suite.log
%{_datadir}/glib-2.0/schemas/org.freedesktop.*.gschema.xml
%{_bindir}/*-createdb
%{_libexecdir}/ibus-*-table
%{_datadir}/icons/hicolor/16x16/apps/ibus-table.png
%{_datadir}/icons/hicolor/22x22/apps/ibus-table.png
%{_datadir}/icons/hicolor/32x32/apps/ibus-table.png
%{_datadir}/icons/hicolor/48x48/apps/ibus-table.png
%{_datadir}/icons/hicolor/64x64/apps/ibus-table.png
%{_datadir}/icons/hicolor/128x128/apps/ibus-table.png
%{_datadir}/icons/hicolor/256x256/apps/ibus-table.png
%{_datadir}/icons/hicolor/scalable/apps/ibus-table.svg
%files devel
%{_datadir}/pkgconfig/*.pc
@ -87,6 +100,9 @@ make check || cat ./tests/test-suite.log
%{_mandir}/man*/*
%changelog
* Fri Sep 01 2023 chenchen <chen_aka_jan@163.com> - 1.17.2-1
- Upgrade to version 1.17.2
* Sat Jan 09 2021 Ge Wang <wangge20@huawei.com> - 1.9.21-6
- Modify homepage url