Compare commits
No commits in common. "c9s" and "c8" have entirely different histories.
@ -1 +0,0 @@
|
||||
1
|
69
.gitignore
vendored
69
.gitignore
vendored
@ -1,68 +1 @@
|
||||
ibus-table-1.3.0.20100621.tar.gz
|
||||
/ibus-table-1.3.9.20110827.tar.gz
|
||||
/ibus-table-1.4.99.20120907.tar.gz
|
||||
/ibus-table-1.4.99.20121113.tar.gz
|
||||
/ibus-table-1.4.99.20130103.tar.gz
|
||||
/ibus-table-1.4.99.20130108.tar.gz
|
||||
/ibus-table-1.4.99.20130110.tar.gz
|
||||
/ibus-table-1.5.0.tar.gz
|
||||
/ibus-table-1.5.0.20130419.tar.gz
|
||||
/ibus-table-1.5.0.20140203.tar.gz
|
||||
/ibus-table-1.5.0.20140205.tar.gz
|
||||
/ibus-table-1.5.0.20140218.tar.gz
|
||||
/ibus-table-1.5.0.20140306.tar.gz
|
||||
/ibus-table-1.5.0.20140311.tar.gz
|
||||
/ibus-table-1.5.0.20140312.tar.gz
|
||||
/ibus-table-1.5.0.20140402.tar.gz
|
||||
/ibus-table-1.5.0.20140409.tar.gz
|
||||
/ibus-table-1.5.0.20140416.tar.gz
|
||||
/ibus-table-1.5.0.20140519.tar.gz
|
||||
/ibus-table-1.5.0.20140527.tar.gz
|
||||
/ibus-table-1.5.0.20140528.tar.gz
|
||||
/ibus-table-1.8.0.tar.gz
|
||||
/ibus-table-1.8.1.tar.gz
|
||||
/ibus-table-1.8.2.tar.gz
|
||||
/ibus-table-1.8.3.tar.gz
|
||||
/ibus-table-1.8.4.tar.gz
|
||||
/ibus-table-1.8.5.tar.gz
|
||||
/ibus-table-1.8.6.tar.gz
|
||||
/ibus-table-1.8.7.tar.gz
|
||||
/ibus-table-1.8.8.tar.gz
|
||||
/ibus-table-1.8.9.tar.gz
|
||||
/ibus-table-1.8.10.tar.gz
|
||||
/ibus-table-1.8.11.tar.gz
|
||||
/ibus-table-1.9.0.tar.gz
|
||||
/ibus-table-1.9.1.tar.gz
|
||||
/ibus-table-1.9.2.tar.gz
|
||||
/ibus-table-1.9.3.tar.gz
|
||||
/ibus-table-1.9.4.tar.gz
|
||||
/ibus-table-1.9.5.tar.gz
|
||||
/ibus-table-1.9.6.tar.gz
|
||||
/ibus-table-1.9.7.tar.gz
|
||||
/ibus-table-1.9.8.tar.gz
|
||||
/ibus-table-1.9.9.tar.gz
|
||||
/ibus-table-1.9.10.tar.gz
|
||||
/ibus-table-1.9.11.tar.gz
|
||||
/ibus-table-1.9.12.tar.gz
|
||||
/ibus-table-1.9.13.tar.gz
|
||||
/ibus-table-1.9.14.tar.gz
|
||||
/ibus-table-1.9.15.tar.gz
|
||||
/ibus-table-1.9.16.tar.gz
|
||||
/ibus-table-1.9.17.tar.gz
|
||||
/ibus-table-1.9.18.tar.gz
|
||||
/ibus-table-1.9.19.tar.gz
|
||||
/ibus-table-1.9.20.tar.gz
|
||||
/ibus-table-1.9.21.tar.gz
|
||||
/ibus-table-1.9.22.tar.gz
|
||||
/ibus-table-1.9.23.tar.gz
|
||||
/ibus-table-1.9.24.tar.gz
|
||||
/ibus-table-1.9.25.tar.gz
|
||||
/ibus-table-1.10.0.tar.gz
|
||||
/ibus-table-1.10.1.tar.gz
|
||||
/ibus-table-1.11.0.tar.gz
|
||||
/ibus-table-1.12.0.tar.gz
|
||||
/ibus-table-1.12.1.tar.gz
|
||||
/ibus-table-1.12.2.tar.gz
|
||||
/ibus-table-1.12.3.tar.gz
|
||||
/ibus-table-1.12.4.tar.gz
|
||||
/ibus-table-1.12.5.tar.gz
|
||||
SOURCES/ibus-table-1.9.18.tar.gz
|
||||
|
1816
SOURCES/add-a-gui-test.patch
Normal file
1816
SOURCES/add-a-gui-test.patch
Normal file
File diff suppressed because it is too large
Load Diff
6974
SOURCES/add-a-test-suite.patch
Normal file
6974
SOURCES/add-a-test-suite.patch
Normal file
File diff suppressed because it is too large
Load Diff
166
SOURCES/fix-test-cases-for-old-ibus-table.patch
Normal file
166
SOURCES/fix-test-cases-for-old-ibus-table.patch
Normal file
@ -0,0 +1,166 @@
|
||||
diff -Nru ibus-table-1.9.18/engine/table.py ibus-table-1.9.18.new/engine/table.py
|
||||
--- ibus-table-1.9.18/engine/table.py 2020-07-23 17:21:31.934904346 +0200
|
||||
+++ ibus-table-1.9.18.new/engine/table.py 2020-07-23 17:28:19.342746241 +0200
|
||||
@@ -1752,6 +1752,9 @@
|
||||
self._input_mode)
|
||||
self._update_ui()
|
||||
|
||||
+ def get_pinyin_mode(self):
|
||||
+ return self._editor._py_mode
|
||||
+
|
||||
def set_onechar_mode(self, mode=False, update_dconf=True):
|
||||
if mode == self._editor._onechar:
|
||||
return
|
||||
diff -Nru ibus-table-1.9.18/tests/test_0_gtk.py ibus-table-1.9.18.new/tests/test_0_gtk.py
|
||||
--- ibus-table-1.9.18/tests/test_0_gtk.py 2020-07-23 17:21:31.940904285 +0200
|
||||
+++ ibus-table-1.9.18.new/tests/test_0_gtk.py 2020-07-23 17:37:23.234210681 +0200
|
||||
@@ -205,14 +205,14 @@
|
||||
object_path = '%s/%d' % (self.ENGINE_PATH, self.__id)
|
||||
db_dir = '/usr/share/ibus-table/tables'
|
||||
db_file = os.path.join(db_dir, engine_name + '.db')
|
||||
- database = tabsqlitedb.TabSqliteDb(filename=db_file, user_db=':memory:')
|
||||
- self.__engine = table.TabEngine(
|
||||
+ database = tabsqlitedb.tabsqlitedb(filename=db_file, user_db=':memory:')
|
||||
+ self.__engine = table.tabengine(
|
||||
self.__bus,
|
||||
object_path,
|
||||
database)
|
||||
self.__engine.connect('focus-in', self.__engine_focus_in)
|
||||
self.__engine.connect('focus-out', self.__engine_focus_out)
|
||||
- # FIXME: Need to connect 'reset' after TabEngine.clear_all_input_and_preedit()
|
||||
+ # FIXME: Need to connect 'reset' after tabengine.clear_all_input_and_preedit()
|
||||
# is called.
|
||||
self.__engine.connect_after('reset', self.__engine_reset)
|
||||
self.__bus.get_connection().signal_subscribe(
|
||||
diff -Nru ibus-table-1.9.18/tests/test_it.py ibus-table-1.9.18.new/tests/test_it.py
|
||||
--- ibus-table-1.9.18/tests/test_it.py 2020-07-23 17:21:31.940904285 +0200
|
||||
+++ ibus-table-1.9.18.new/tests/test_it.py 2020-07-23 17:29:52.032800325 +0200
|
||||
@@ -78,7 +78,6 @@
|
||||
ORIG_SINGLE_WILDCARD_CHAR = None
|
||||
ORIG_MULTI_WILDCARD_CHAR = None
|
||||
ORIG_PINYIN_MODE = None
|
||||
-ORIG_SUGGESTION_MODE = None
|
||||
|
||||
def backup_original_settings():
|
||||
global ENGINE
|
||||
@@ -97,7 +96,6 @@
|
||||
global ORIG_SINGLE_WILDCARD_CHAR
|
||||
global ORIG_MULTI_WILDCARD_CHAR
|
||||
global ORIG_PINYIN_MODE
|
||||
- global ORIG_SUGGESTION_MODE
|
||||
ORIG_INPUT_MODE = ENGINE.get_input_mode()
|
||||
ORIG_CHINESE_MODE = ENGINE.get_chinese_mode()
|
||||
ORIG_LETTER_WIDTH = ENGINE.get_letter_width()
|
||||
@@ -113,7 +111,6 @@
|
||||
ORIG_SINGLE_WILDCARD_CHAR = ENGINE.get_single_wildcard_char()
|
||||
ORIG_MULTI_WILDCARD_CHAR = ENGINE.get_multi_wildcard_char()
|
||||
ORIG_PINYIN_MODE = ENGINE.get_pinyin_mode()
|
||||
- ORIG_SUGGESTION_MODE = ENGINE.get_suggestion_mode()
|
||||
|
||||
def restore_original_settings():
|
||||
global ENGINE
|
||||
@@ -132,7 +129,6 @@
|
||||
global ORIG_SINGLE_WILDCARD_CHAR
|
||||
global ORIG_MULTI_WILDCARD_CHAR
|
||||
global ORIG_PINYIN_MODE
|
||||
- global ORIG_SUGGESTION_MODE
|
||||
ENGINE.set_input_mode(ORIG_INPUT_MODE)
|
||||
ENGINE.set_chinese_mode(ORIG_CHINESE_MODE)
|
||||
ENGINE.set_letter_width(ORIG_LETTER_WIDTH[0], input_mode=0)
|
||||
@@ -150,7 +146,6 @@
|
||||
ENGINE.set_single_wildcard_char(ORIG_SINGLE_WILDCARD_CHAR)
|
||||
ENGINE.set_multi_wildcard_char(ORIG_MULTI_WILDCARD_CHAR)
|
||||
ENGINE.set_pinyin_mode(ORIG_PINYIN_MODE)
|
||||
- ENGINE.set_suggestion_mode(ORIG_SUGGESTION_MODE)
|
||||
|
||||
def set_default_settings():
|
||||
global ENGINE
|
||||
@@ -256,7 +251,6 @@
|
||||
ENGINE.set_multi_wildcard_char(multi_wildcard_char)
|
||||
|
||||
ENGINE.set_pinyin_mode(False)
|
||||
- ENGINE.set_suggestion_mode(False)
|
||||
|
||||
def set_up(engine_name):
|
||||
'''
|
||||
@@ -290,7 +284,7 @@
|
||||
assert IBus.PropList is not IBUS_PROP_LIST
|
||||
assert IBus.PropList is MockPropList
|
||||
# Reload the table module so that the patches
|
||||
- # are applied to TabEngine:
|
||||
+ # are applied to tabengine:
|
||||
sys.path.insert(0, '../engine')
|
||||
importlib.reload(table)
|
||||
sys.path.pop(0)
|
||||
@@ -302,9 +296,9 @@
|
||||
ENGINE = None
|
||||
tear_down()
|
||||
return False
|
||||
- TABSQLITEDB = tabsqlitedb.TabSqliteDb(
|
||||
+ TABSQLITEDB = tabsqlitedb.tabsqlitedb(
|
||||
filename=db_file, user_db=':memory:')
|
||||
- ENGINE = table.TabEngine(
|
||||
+ ENGINE = table.tabengine(
|
||||
bus,
|
||||
'/com/redhat/IBus/engines/table/%s/engine/0' %engine_name,
|
||||
TABSQLITEDB,
|
||||
@@ -380,59 +374,6 @@
|
||||
self.assertEqual(ENGINE.mock_preedit_text, '')
|
||||
self.assertEqual(ENGINE.mock_committed_text, '工爱工')
|
||||
|
||||
- def test_suggestion_mode(self):
|
||||
- if not ENGINE._ime_sg:
|
||||
- self.skipTest("This engine does not have a suggestion mode.")
|
||||
- # Suggestion mode is False by default:
|
||||
- self.assertEqual(ENGINE.get_suggestion_mode(), False)
|
||||
- self.assertEqual(ENGINE.get_pinyin_mode(), False)
|
||||
- ENGINE.do_process_key_event(IBus.KEY_a, 0, 0)
|
||||
- self.assertEqual(ENGINE.mock_preedit_text, '工')
|
||||
- ENGINE.do_process_key_event(IBus.KEY_space, 0, 0)
|
||||
- self.assertEqual(ENGINE.mock_preedit_text, '')
|
||||
- self.assertEqual(ENGINE.mock_committed_text, '工')
|
||||
- self.assertEqual(ENGINE._editor._lookup_table.mock_candidates, [])
|
||||
- ENGINE.set_suggestion_mode(True)
|
||||
- ENGINE.do_process_key_event(IBus.KEY_a, 0, 0)
|
||||
- self.assertEqual(ENGINE.mock_preedit_text, '工')
|
||||
- ENGINE.do_process_key_event(IBus.KEY_space, 0, 0)
|
||||
- self.assertEqual(ENGINE.mock_preedit_text, '')
|
||||
- self.assertEqual(ENGINE.mock_committed_text, '工工')
|
||||
- self.assertEqual(ENGINE._editor._lookup_table.mock_candidates,
|
||||
- ['工作人员 673 0',
|
||||
- '工作会议 310 0',
|
||||
- '工作报告 267 0',
|
||||
- '工人阶级 146 0',
|
||||
- '工作重点 78 0',
|
||||
- '工作小组 73 0',
|
||||
- '工业企业 71 0',
|
||||
- '工业大学 69 0',
|
||||
- '工作单位 61 0',
|
||||
- '工业生产 58 0'])
|
||||
- ENGINE.do_process_key_event(IBus.KEY_space, 0, 0)
|
||||
- self.assertEqual(ENGINE.mock_preedit_text, '')
|
||||
- self.assertEqual(ENGINE.mock_committed_text, '工工作人员')
|
||||
- ENGINE.set_pinyin_mode(True)
|
||||
- ENGINE.do_process_key_event(IBus.KEY_a, 0, 0)
|
||||
- self.assertEqual(ENGINE.mock_preedit_text, '爱')
|
||||
- ENGINE.do_process_key_event(IBus.KEY_space, 0, 0)
|
||||
- self.assertEqual(ENGINE.mock_preedit_text, '')
|
||||
- self.assertEqual(ENGINE.mock_committed_text, '工工作人员爱')
|
||||
- self.assertEqual(ENGINE._editor._lookup_table.mock_candidates,
|
||||
- ['爱因斯坦 1109 0',
|
||||
- '爱情故事 519 0',
|
||||
- '爱国主义 191 0',
|
||||
- '爱尔兰语 91 0',
|
||||
- '爱好和平 62 0',
|
||||
- '爱情小说 58 0',
|
||||
- '爱不释手 39 0',
|
||||
- '爱国热情 35 0',
|
||||
- '爱莫能助 34 0',
|
||||
- '爱理不理 32 0'])
|
||||
- ENGINE.do_process_key_event(IBus.KEY_space, 0, 0)
|
||||
- self.assertEqual(ENGINE.mock_preedit_text, '')
|
||||
- self.assertEqual(ENGINE.mock_committed_text, '工工作人员爱因斯坦')
|
||||
-
|
||||
def test_commit_to_preedit_switching_to_pinyin_defining_a_phrase(self):
|
||||
ENGINE.do_process_key_event(IBus.KEY_a, 0, 0)
|
||||
# commit to preëdit needs a press and release of either
|
62
SOURCES/use-config-not-gsettings-for-gui-test.patch
Normal file
62
SOURCES/use-config-not-gsettings-for-gui-test.patch
Normal file
@ -0,0 +1,62 @@
|
||||
diff -ru ibus-table-1.9.18.orig/tests/test_0_gtk.py ibus-table-1.9.18/tests/test_0_gtk.py
|
||||
--- ibus-table-1.9.18.orig/tests/test_0_gtk.py 2020-07-27 09:41:25.799087549 +0200
|
||||
+++ ibus-table-1.9.18/tests/test_0_gtk.py 2020-07-28 12:23:43.127130148 +0200
|
||||
@@ -68,6 +68,7 @@
|
||||
|
||||
DONE_EXIT = True
|
||||
ENGINE_NAME = 'wubi-jidian86'
|
||||
+CONFIG_SECTION = 'engine/table/%s' % ENGINE_NAME
|
||||
|
||||
from gtkcases import TestCases
|
||||
|
||||
@@ -96,16 +97,18 @@
|
||||
class SimpleGtkTestCase(unittest.TestCase):
|
||||
global DONE_EXIT
|
||||
global ENGINE_NAME
|
||||
+ global CONFIG_SECTION
|
||||
ENGINE_PATH = '/com/redhat/IBus/engines/table/Test/Engine'
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
cls._flag = False
|
||||
IBus.init()
|
||||
- cls._gsettings = Gio.Settings(
|
||||
- schema='org.freedesktop.ibus.engine.table',
|
||||
- path='/org/freedesktop/ibus/engine/table/%s/' % ENGINE_NAME)
|
||||
- cls._orig_chinesemode = cls._gsettings.get_int('chinesemode')
|
||||
+ cls.__bus = IBus.Bus()
|
||||
+ cls._config = cls.__bus.get_config()
|
||||
+ cls._orig_chinesemode = table.variant_to_value(
|
||||
+ cls._config.get_value(
|
||||
+ CONFIG_SECTION, 'chinesemode'))
|
||||
signums = [getattr(signal, s, None) for s in
|
||||
'SIGINT SIGTERM SIGHUP'.split()]
|
||||
for signum in filter(None, signums):
|
||||
@@ -116,7 +119,11 @@
|
||||
(signum, original_handler))
|
||||
@classmethod
|
||||
def tearDownClass(cls):
|
||||
- cls._gsettings.set_int('chinesemode', cls._orig_chinesemode)
|
||||
+ if cls._orig_chinesemode:
|
||||
+ cls._config.set_value(
|
||||
+ CONFIG_SECTION,
|
||||
+ 'chinesemode',
|
||||
+ GLib.Variant.new_int32(cls._orig_chinesemode))
|
||||
|
||||
@classmethod
|
||||
def signal_handler(cls, user_data):
|
||||
@@ -136,10 +142,12 @@
|
||||
self.__inserted_text = ''
|
||||
self.__commit_done = False
|
||||
self.__reset_coming = False
|
||||
- self._gsettings.set_int('chinesemode', 4)
|
||||
+ self._config.set_value(
|
||||
+ CONFIG_SECTION,
|
||||
+ 'chinesemode',
|
||||
+ GLib.Variant.new_int32(4))
|
||||
|
||||
def register_ibus_engine(self):
|
||||
- self.__bus = IBus.Bus()
|
||||
if not self.__bus.is_connected():
|
||||
self.fail('ibus-daemon is not running')
|
||||
return False
|
@ -1,21 +1,26 @@
|
||||
Name: ibus-table
|
||||
Version: 1.12.5
|
||||
Release: 5%{?dist}
|
||||
Version: 1.9.18
|
||||
Release: 8%{?dist}
|
||||
Summary: The Table engine for IBus platform
|
||||
License: LGPLv2+
|
||||
Group: System Environment/Libraries
|
||||
URL: http://code.google.com/p/ibus/
|
||||
Source0: http://mfabian.fedorapeople.org/ibus-table/%{name}-%{version}.tar.gz
|
||||
Patch0: add-a-test-suite.patch
|
||||
Patch1: add-a-gui-test.patch
|
||||
Patch2: use-config-not-gsettings-for-gui-test.patch
|
||||
Patch3: fix-test-cases-for-old-ibus-table.patch
|
||||
Requires: ibus > 1.3.0
|
||||
%{?__python3:Requires: %{__python3}}
|
||||
BuildRequires: gcc
|
||||
Requires: %{__python3}
|
||||
BuildRequires: ibus-devel > 1.3.0
|
||||
BuildRequires: python3-devel
|
||||
# for the unit tests
|
||||
%if 0%{?fedora}
|
||||
BuildRequires: appstream
|
||||
%endif
|
||||
BuildRequires: automake
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: python3-mock
|
||||
BuildRequires: python3-gobject
|
||||
BuildRequires: python3-gobject-base
|
||||
BuildRequires: dbus-x11
|
||||
@ -23,14 +28,10 @@ BuildRequires: xorg-x11-server-Xvfb
|
||||
BuildRequires: ibus-table-chinese-wubi-jidian
|
||||
BuildRequires: ibus-table-chinese-cangjie
|
||||
BuildRequires: ibus-table-chinese-stroke5
|
||||
BuildRequires: ibus-table-code
|
||||
BuildRequires: ibus-table-latin
|
||||
BuildRequires: ibus-table-translit
|
||||
BuildRequires: ibus-table-tv
|
||||
BuildRequires: make
|
||||
|
||||
Obsoletes: ibus-table-additional < 1.2.0.20100111-5
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@ -38,6 +39,7 @@ The Table engine for IBus platform.
|
||||
|
||||
%package -n %{name}-devel
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}, pkgconfig
|
||||
|
||||
%description -n %{name}-devel
|
||||
@ -53,45 +55,34 @@ the functionality of the installed %{name} package.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .add-a-test-suite
|
||||
%patch1 -p1 -b .add-a-gui-test
|
||||
%patch2 -p1 -b .use-config-not-gsettings-for-gui-test
|
||||
%patch3 -p1 -b .fix-test-cases-for-old-ibus-table
|
||||
|
||||
%build
|
||||
export PYTHON=%{__python3}
|
||||
%configure --disable-static --disable-additional --enable-installed-tests
|
||||
./autogen.sh --prefix=/usr
|
||||
%configure --enable-installed-tests
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%__rm -rf $RPM_BUILD_ROOT
|
||||
export PYTHON=%{__python3}
|
||||
%__make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install pkgconfigdir=%{_datadir}/pkgconfig
|
||||
%py_byte_compile %{python3} /usr/share/ibus-table/engine
|
||||
%py_byte_compile %{python3} /usr/share/ibus-table/setup
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%check
|
||||
%if 0%{?fedora}
|
||||
appstreamcli validate --pedantic --explain --no-net %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
|
||||
%endif
|
||||
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
|
||||
desktop-file-validate \
|
||||
$RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-table.desktop
|
||||
pushd engine
|
||||
# run doctests
|
||||
python3 table.py
|
||||
python3 it_util.py
|
||||
%{__python3} table.py
|
||||
%{__python3} it_util.py
|
||||
popd
|
||||
mkdir -p /tmp/glib-2.0/schemas/
|
||||
cp org.freedesktop.ibus.engine.table.gschema.xml \
|
||||
/tmp/glib-2.0/schemas/org.freedesktop.ibus.engine.table.gschema.xml
|
||||
glib-compile-schemas /tmp/glib-2.0/schemas #&>/dev/null || :
|
||||
export XDG_DATA_DIRS=/tmp
|
||||
eval $(dbus-launch --sh-syntax)
|
||||
dconf dump /
|
||||
dconf write /org/freedesktop/ibus/engine/table/wubi-jidian/chinesemode 1
|
||||
dconf write /org/freedesktop/ibus/engine/table/wubi-jidian/spacekeybehavior false
|
||||
dconf dump /
|
||||
export DISPLAY=:1
|
||||
Xvfb $DISPLAY -screen 0 1024x768x16 &
|
||||
ibus-daemon -drx # not needed on Fedora 32
|
||||
# A window manager and and ibus-daemon are needed to run the GUI
|
||||
# test tests/test_gtk.py, for example i3 can be used.
|
||||
#
|
||||
@ -117,19 +108,24 @@ if [ $rc != 0 ] ; then
|
||||
exit $rc
|
||||
fi
|
||||
|
||||
%clean
|
||||
%__rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS COPYING README
|
||||
%{_datadir}/%{name}
|
||||
%{_datadir}/metainfo/*.appdata.xml
|
||||
%{_datadir}/ibus/component/table.xml
|
||||
%{_datadir}/applications/ibus-setup-table.desktop
|
||||
%{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.engine.table.gschema.xml
|
||||
%{_bindir}/%{name}-createdb
|
||||
%{_libexecdir}/ibus-engine-table
|
||||
%{_libexecdir}/ibus-setup-table
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%files devel
|
||||
%defattr(-, root, root, -)
|
||||
%{_datadir}/pkgconfig/%{name}.pc
|
||||
|
||||
%files tests
|
||||
@ -139,187 +135,30 @@ fi
|
||||
%{_datadir}/installed-tests/%{name}
|
||||
|
||||
%changelog
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.12.5-5
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
* Tue Oct 10 2023 Mike FABIAN <mfabian@redhat.com> - 1.9.18-8
|
||||
- Fix unit tests, bump release number for new build
|
||||
Resolves: RHEL-2236
|
||||
|
||||
* Fri Jul 16 2021 Mike FABIAN <mfabian@redhat.com> - 1.12.5-4
|
||||
- Related: rhbz#1974631 Delete ibus write-cache in scriptlet
|
||||
* Thu Sep 21 2023 Mike FABIAN <mfabian@redhat.com> - 1.9.18-7
|
||||
- Fix requirements of Python 3
|
||||
Resolves: RHEL-2236
|
||||
|
||||
* Wed Jun 30 2021 Mike FABIAN <mfabian@redhat.com> - 1.12.5-3
|
||||
- Resolves: rhbz#1974631 Delete ibus write-cache in scriptlet
|
||||
- Improve CI tests and add gating.yaml
|
||||
* Tue Feb 16 2021 Mike FABIAN <mfabian@redhat.com> - 1.9.18-6
|
||||
- Fix a covscan error
|
||||
- Related: rhbz#1929102
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.12.5-2
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
* Tue Feb 16 2021 Mike FABIAN <mfabian@redhat.com> - 1.9.18-5
|
||||
- Bump release number to add the new subpackage ibus-table-tests
|
||||
- Resolves: rhbz#1929102
|
||||
|
||||
* Fri Mar 05 2021 Mike FABIAN <mfabian@redhat.com> - 1.12.5-1
|
||||
- Update to 1.12.5
|
||||
- Return False in _execute_command_commit_candidate_number(self, number)
|
||||
if number out of range
|
||||
- Resolves: https://github.com/moebiuscurve/ibus-table-others/issues/21
|
||||
- remove Use-from-unittest-import-mock-instead-of-just-import.patch
|
||||
(included upstream)
|
||||
- Update translations from Weblate (New translation for Sinhala (si) started)
|
||||
* Sat Jul 25 2020 Mike FABIAN <mfabian@redhat.com> - 1.9.18-4
|
||||
- Add gating tests to ibus-table
|
||||
- Resolves: rhbz#1682163
|
||||
|
||||
* Wed Feb 17 2021 Mike FABIAN <mfabian@redhat.com> - 1.12.4-5
|
||||
- Use “BuildRequires: appstream” only on Fedora
|
||||
|
||||
* Tue Feb 16 2021 Mike FABIAN <mfabian@redhat.com> - 1.12.4-4
|
||||
- Remove i3 from BuildRequires
|
||||
|
||||
* Tue Feb 02 2021 Mike FABIAN <mfabian@redhat.com> - 1.12.4-3
|
||||
- Use standard library mock
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Sun Jan 24 2021 Mike FABIAN <mfabian@redhat.com> - 1.12.4-1
|
||||
- Update to 1.12.4
|
||||
- Update translations from Weblate (updated es, cs, fa, pt_BR, zh_CN).
|
||||
zh_CN is 100% complete now.
|
||||
|
||||
* Wed Jan 06 2021 Mike FABIAN <mfabian@redhat.com> - 1.12.3-1
|
||||
- Update to 1.12.3
|
||||
- Pass the key for the command 'cancel' (default Esc) through
|
||||
if the preedit is empty
|
||||
- Resolves: https://github.com/kaio/ibus-table/issues/64
|
||||
|
||||
* Mon Jan 04 2021 Mike FABIAN <mfabian@redhat.com> - 1.12.2-1
|
||||
- Update to 1.12.2
|
||||
- Update translations from Weblate
|
||||
(updated ca, cs, es, fa, ja, pt_BR, pt_PT, tr, zh_CN, zh_HK, zh_TW)
|
||||
|
||||
* Fri Sep 04 2020 Mike FABIAN <mfabian@redhat.com> - 1.12.1-1
|
||||
- Update to 1.12.1
|
||||
- Enable compose support.
|
||||
- Add buttons to move key bindings for a command up or down.
|
||||
- Make translations of 'Edit key bindings for command “%s”' work
|
||||
- Added it_util.py to POTFILES, it had translatable strings for
|
||||
the “About” dialog and the key settings dialog.
|
||||
- Update translations from Weblate (updated ca, de, fr, tr, uk)
|
||||
|
||||
* Wed Aug 26 2020 Mike FABIAN <mfabian@redhat.com> - 1.12.0-1
|
||||
- Update to 1.12.0
|
||||
- New setup tool, now keybindings can be configured with a GUI.
|
||||
- Resolves: https://github.com/kaio/ibus-table/issues/57
|
||||
- Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1133127
|
||||
- Put exact (except tone) pinyin matches next after exact
|
||||
matches in the candidate list.
|
||||
- Resolves: https://github.com/kaio/ibus-table/issues/63
|
||||
- Allow lookup table orientation “System Default” in the setup
|
||||
- Remove “spacekeybehavior” option, it became useless as all
|
||||
keybindings are configurable now.
|
||||
- Added a “debuglevel” option.
|
||||
- Update translations from Weblate (updated ca, cs, de, es, fa,
|
||||
fr, ja, pt_BR, pt_PT, uk, zh_TW, zh_HK, zh_CN)
|
||||
|
||||
* Sun Aug 16 2020 Mike FABIAN <mfabian@redhat.com> - 1.11.0-1
|
||||
- Update to 1.11.0
|
||||
- Make key bindings configurable.
|
||||
Only via the command line for the moment, not yet easy to do
|
||||
for normal users. I have to rewrite the setup tool eventually
|
||||
to make that possible.
|
||||
- Resolves: https://github.com/ibus/ibus/issues/2241
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 15 2020 Mike FABIAN <mfabian@redhat.com> - 1.10.1-1
|
||||
- Update to 1.10.1
|
||||
- Add GUI test
|
||||
- Make output of ibus-table-createdb deterministic
|
||||
- Update translations from Weblate (updated fr, tr, zh_CN)
|
||||
|
||||
* Wed Jul 01 2020 Mike FABIAN <mfabian@redhat.com> - 1.10.0-1
|
||||
- Update to 1.10.0
|
||||
- Add suggestion mode feature
|
||||
- Resolves: https://github.com/mike-fabian/ibus-table/pull/9
|
||||
- Resolves: rhbz#835376
|
||||
- Add test cases for suggestion mode feature
|
||||
- Fix problems with the behaviour of the property menus
|
||||
- Use python logging module with log file rotation instead
|
||||
of writing to stdout/stderr
|
||||
- Update translations from Weblate (updated de, es, fr, pt_BR, pt_PT, tr, uk)
|
||||
|
||||
* Mon Jun 22 2020 Mike FABIAN <mfabian@redhat.com> - 1.9.25-3
|
||||
- Byte compile python files namually,
|
||||
see: https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_3
|
||||
|
||||
* Thu Jun 04 2020 Miro Hrončok <mhroncok@redhat.com> - 1.9.25-2
|
||||
- Don't explicitly require python(abi) >= 3.3
|
||||
|
||||
* Wed Feb 12 2020 Mike FABIAN <mfabian@redhat.com> - 1.9.25-1
|
||||
- update to 1.9.25
|
||||
- Fix crash when changing some options using the menu or the floating panel
|
||||
- Resolves: rhbz#1803028
|
||||
- Translation updates (pt_PT)
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.24-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Jan 22 2020 Mike FABIAN <mfabian@redhat.com> - 1.9.24-1
|
||||
- update to 1.9.24
|
||||
- Fixed two typos in message ids (Thanks to Rafael Fontenelle)
|
||||
- Translation updates (tr, fr, fa, pt, uk)
|
||||
- New test cases for ibus-table-others
|
||||
|
||||
* Tue Jan 07 2020 Mike FABIAN <mfabian@redhat.com> - 1.9.23-1
|
||||
- update to 1.9.23
|
||||
- Add exist_ok=True in os.makedirs(path, exist_ok=True) to
|
||||
avoid failure due to race condition.
|
||||
- Resolves:rhbz#1786652
|
||||
- Move MockEngine classes into a separate file and make
|
||||
test_itb.py runnable standalone
|
||||
- Translation updates for several languages (French at 100%
|
||||
now, Brazilian Portuguese at 100% now, Portuguese
|
||||
(Portugal) new and now at 31.5%)
|
||||
|
||||
* Tue Dec 17 2019 Mike FABIAN <mfabian@redhat.com> - 1.9.22-1
|
||||
- update to 1.9.22
|
||||
- Add Turkish translation from Weblate, 100% translated
|
||||
- Minor translation fixes in some other languages (Punctuation fixes)
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.21-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Feb 12 2019 Mike FABIAN <mfabian@redhat.com> - 1.9.21-4
|
||||
- Fix FTBFS in Fedora rawhide/f30: Add gcc and dbus-x11 to BuildRequires
|
||||
(Resolves: rhbz#1676299)
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.21-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Oct 09 2018 Mike FABIAN <mfabian@redhat.com> - 1.9.21-2
|
||||
* Thu Sep 20 2018 Tomas Orsava <torsava@redhat.com> - 1.9.18-3
|
||||
- Require the Python interpreter directly instead of using the package name
|
||||
- Related: rhbz#1619153
|
||||
|
||||
* Wed Aug 29 2018 Mike FABIAN <mfabian@redhat.com> - 1.9.21-1
|
||||
- update to 1.9.21
|
||||
- Migrate IBusConfig to GSettings.
|
||||
Resolves: https://github.com/mike-fabian/ibus-table/issues/4
|
||||
- Add a test suite
|
||||
- Add missing tags to ibus-table-createdb.sgml.
|
||||
Resolves: https://github.com/mike-fabian/ibus-table/issues/3
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.20-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.9.20-2
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Thu May 03 2018 Mike FABIAN <mfabian@redhat.com> - 1.9.20-1
|
||||
- update to 1.9.20
|
||||
- Draw InputMode text instead of icon into panel on non-Gnome desktops.
|
||||
Resolves: https://github.com/mike-fabian/ibus-table/issues/6
|
||||
(Thanks to Takao Fujiwara)
|
||||
- Make it work with Python2 again
|
||||
|
||||
* Mon Apr 30 2018 Mike FABIAN <mfabian@redhat.com> - 1.9.19-1
|
||||
- update to 1.9.19
|
||||
- Sync phrases cache from/to external storage (thanks to heiher).
|
||||
- Update translations from zanata (cs new)
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.18-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
@ -1,6 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
@ -1,9 +0,0 @@
|
||||
summary: Basic smoke test
|
||||
discover:
|
||||
how: fmf
|
||||
execute:
|
||||
how: tmt
|
||||
prepare:
|
||||
how: shell
|
||||
script:
|
||||
- dnf config-manager --enable rhel-CRB --enable rhel-buildroot
|
1
sources
1
sources
@ -1 +0,0 @@
|
||||
SHA512 (ibus-table-1.12.5.tar.gz) = 1fbbf07c64b366c84ca463e0e5f21a6008cc488f75ac24466d94982f70c04b6b882f098bae210d4f32c381c24899c5c0da389a501c30ef5e3dd679828720ab5a
|
@ -1,47 +0,0 @@
|
||||
test: ./runtest.sh
|
||||
duration: 50m
|
||||
framework: beakerlib
|
||||
require:
|
||||
# This stuff is only needed if gnome-desktop-testing
|
||||
# cannot be required as a package and needs to be cloned
|
||||
# from the git repo and build from source:
|
||||
- git
|
||||
- make
|
||||
- gcc
|
||||
- diffutils
|
||||
- autoconf
|
||||
- automake
|
||||
- libtool
|
||||
- glib2-devel
|
||||
- systemd-devel
|
||||
# Other requirements:
|
||||
- gnome-session
|
||||
- gnome-shell
|
||||
- ibus
|
||||
- ibus-devel
|
||||
- ibus-desktop-testing
|
||||
- ibus-table
|
||||
- ibus-table-tests
|
||||
- rsync
|
||||
- xorg-x11-server-Xvfb
|
||||
- appstream
|
||||
- libappstream-glib
|
||||
- desktop-file-utils
|
||||
- python3-gobject
|
||||
- python3-gobject-base
|
||||
- glib2
|
||||
- gtk3
|
||||
- dconf
|
||||
- dbus-x11
|
||||
- python3-devel
|
||||
- python3-pyxdg
|
||||
- xorg-x11-server-Xvfb
|
||||
- ibus-table-chinese-wubi-jidian
|
||||
- ibus-table-chinese-cangjie
|
||||
- ibus-table-chinese-stroke5
|
||||
- ibus-table-code
|
||||
- ibus-table-latin
|
||||
- ibus-table-translit
|
||||
recommend:
|
||||
# this is not available on RHEL9
|
||||
- gnome-desktop-testing
|
@ -1,47 +0,0 @@
|
||||
#!/bin/bash
|
||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||
|
||||
NAME=ibus-table
|
||||
|
||||
rlJournalStart
|
||||
rlPhaseStartSetup
|
||||
rlAssertRpm ${NAME}
|
||||
rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
|
||||
rlRun "pushd $tmp"
|
||||
if ! rlCheckRpm gnome-desktop-testing; then
|
||||
echo "gnome-desktop-testing is not available."
|
||||
echo "Trying to download and compile it:"
|
||||
git clone https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git
|
||||
pushd gnome-desktop-testing
|
||||
./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
|
||||
make
|
||||
make install
|
||||
popd
|
||||
fi
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest
|
||||
rlRun "ibus-desktop-testing-runner \
|
||||
--no-graphics \
|
||||
--runner=gnome \
|
||||
--timeout=1500 \
|
||||
--tests=${NAME} \
|
||||
--output=${NAME}.log \
|
||||
--result=test.log \
|
||||
" 0 "Running ${NAME} tests"
|
||||
echo "==== ${NAME}.log: ===="
|
||||
cat ${NAME}.log
|
||||
echo "==== EOF ${NAME}.log: ===="
|
||||
echo "==== test.log ===="
|
||||
cat test.log
|
||||
echo "==== EOF test.log: ===="
|
||||
rlAssertNotGrep FAIL test.log
|
||||
rlFileSubmit ${NAME}.log
|
||||
rlFileSubmit test.log
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartCleanup
|
||||
rlRun "popd"
|
||||
rlRun "rm -r $tmp" 0 "Remove tmp directory"
|
||||
rlPhaseEnd
|
||||
rlJournalEnd
|
Loading…
Reference in New Issue
Block a user