diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..0a80fdce31f59c062e2abba28776e9521eddff30 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..e3bf87ae33887344309c8c7f29987337339451e9 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/ibus-typing-booster diff --git a/ibus-typing-booster-2.25.7.tar.gz b/ibus-typing-booster-2.25.7.tar.gz deleted file mode 100644 index 7743a9448bb4d97611e2f6e94634b3f0db826f76..0000000000000000000000000000000000000000 Binary files a/ibus-typing-booster-2.25.7.tar.gz and /dev/null differ diff --git a/ibus-typing-booster-2.26.12.tar.gz b/ibus-typing-booster-2.26.12.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f314984df76310507a771831106dd6fe8e748791 --- /dev/null +++ b/ibus-typing-booster-2.26.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fda4b581fab13db465a5bbcf44fc1d8508cfd8ec374cc6a994a042768767695b +size 13338557 diff --git a/ibus-typing-booster.spec b/ibus-typing-booster.spec index 5ed0b0ba1c174d112bd61add6687ef77390acf82..860e17c17819be964d633357eaa5668e46861ee5 100644 --- a/ibus-typing-booster.spec +++ b/ibus-typing-booster.spec @@ -1,5 +1,5 @@ Name: ibus-typing-booster -Version: 2.25.7 +Version: 2.26.12 Release: 1 Summary: A completion input method to speedup typing @@ -8,6 +8,9 @@ URL: https://mike-fabian.github.io/ibus-typing-booster/ Source0: https://github.com/mike-fabian/ibus-typing-booster/releases/download/%{version}/ibus-typing-booster-%{version}.tar.gz BuildArch: noarch +BuildRequires: pkgconfig(ibus-1.0) >= 1.1.0 +BuildRequires: python3-devel >= 3.6 + BuildRequires: ibus-devel m17n-db-extras libappstream-glib glib2 BuildRequires: python3-devel python3-pyxdg python3-enchant BuildRequires: m17n-lib hunspell-cs hunspell-de hunspell-en @@ -64,7 +67,7 @@ gzip -n --force --best $RPM_BUILD_ROOT/%{_datadir}/ibus-typing-booster/data/*.js %find_lang ibus-typing-booster -%delete_la_and_a +%delete_la %check export LC_ALL=en_US.UTF-8 @@ -74,24 +77,27 @@ desktop-file-validate \ desktop-file-validate \ $RPM_BUILD_ROOT%{_datadir}/applications/emoji-picker.desktop pushd engine - # run doctests - python3 hunspell_suggest.py - python3 m17n_translit.py - python3 itb_emoji.py - python3 itb_util.py + if [ -e /usr/share/m17n/si-wijesekara.mim ] ; then + python3 m17n_translit.py -v + else + echo "/usr/share/m17n/si-wijesekara.mim does not exist, m17n-db probably < 1.8.6, skipping doctest of m17n_translit.py" + fi + python3 itb_emoji.py -v + python3 itb_util.py -v popd + mkdir -p /tmp/glib-2.0/schemas/ cp org.freedesktop.ibus.engine.typing-booster.gschema.xml \ /tmp/glib-2.0/schemas/org.freedesktop.ibus.engine.typing-booster.gschema.xml glib-compile-schemas /tmp/glib-2.0/schemas #&>/dev/null || : -export XDG_DATA_DIRS=/tmp +export XDG_DATA_DIRS=/tmp:%{_datadir} # /usr/share is needed to make enchant2 work! eval $(dbus-launch --sh-syntax) dconf dump / dconf write /org/freedesktop/ibus/engine/typing-booster/offtherecord false dconf write /org/freedesktop/ibus/engine/typing-booster/usedigitsasselectkeys true dconf write /org/freedesktop/ibus/engine/typing-booster/addspaceoncommit true dconf write /org/freedesktop/ibus/engine/typing-booster/tabenable false -dconf write /org/freedesktop/ibus/engine/typing-booster/inputmethod "'NoIme'" +dconf write /org/freedesktop/ibus/engine/typing-booster/inputmethod "'NoIME'" dconf write /org/freedesktop/ibus/engine/typing-booster/rememberlastusedpreeditime true dconf write /org/freedesktop/ibus/engine/typing-booster/mincharcomplete 1 dconf write /org/freedesktop/ibus/engine/typing-booster/dictionary "'en_US'" @@ -100,18 +106,17 @@ dconf write /org/freedesktop/ibus/engine/typing-booster/autocommitcharacters "'' dconf write /org/freedesktop/ibus/engine/typing-booster/pagesize 6 dconf write /org/freedesktop/ibus/engine/typing-booster/shownumberofcandidates true dconf write /org/freedesktop/ibus/engine/typing-booster/showstatusinfoinaux true +dconf write /org/freedesktop/ibus/engine/typing-booster/inlinecompletion false +dconf write /org/freedesktop/ibus/engine/typing-booster/keybindings "{'next_input_method': <['Control+Down', 'Control+KP_Down']>, 'previous_input_method': <['Control+Up', 'Control+KP_Up']>, 'lookup_related': <['Mod5+F12']>, 'enable_lookup': <['Tab', 'ISO_Left_Tab', 'KP_Divide']>, 'select_next_candidate': <['Tab', 'ISO_Left_Tab', 'Down', 'KP_Down']>, 'lookup_table_page_down': <['Page_Down', 'KP_Page_Down', 'KP_Next']>, 'toggle_emoji_prediction': <['Mod5+F6']>, 'lookup_table_page_up': <['Page_Up', 'KP_Page_Up', 'KP_Prior']>, 'toggle_off_the_record': <['Mod5+F9']>, 'cancel': <['Escape']>, 'setup': <['Mod5+F10']>, 'select_previous_candidate': <['Shift+Tab', 'Shift+ISO_Left_Tab', 'Up', 'KP_Up']>}" dconf dump / -ibus-daemon -drx -make check || cat ./tests/test-suite.log -%post -[ -x %{_bindir}/ibus ] && %{_bindir}/ibus write-cache --system &>/dev/null || : - -%postun -[ -x %{_bindir}/ibus ] && %{_bindir}/ibus write-cache --system &>/dev/null || : +make check && rc=0 || rc=1 +cat tests/*.log +if [ $rc != 0 ] ; then + exit $rc +fi %files -f ibus-typing-booster.lang -%defattr(-,root,root) %doc AUTHORS %license COPYING %{_bindir}/emoji-picker @@ -124,11 +129,13 @@ make check || cat ./tests/test-suite.log %{_datadir}/applications/*.desktop %files help -%defattr(-,root,root) %doc README README.html README.md %changelog +* Tue Dec 17 2024 Funda Wang - 2.26.12-1 +- update to 2.26.12 + * Mon Apr 29 2024 wangqia - 2.25.7-1 - Upgrade to version 2.25.7 diff --git a/ibus-typing-booster.yaml b/ibus-typing-booster.yaml index b4b75daf062c74a8bc23aa2aef15329fa2a25ccb..55b41cbc710392571d4180e0f5b8c1c2db2121b6 100644 --- a/ibus-typing-booster.yaml +++ b/ibus-typing-booster.yaml @@ -1,4 +1,4 @@ version_control: github -src_repo: mike-fabian/ibus-typing-booster -tag_prefix: ^v -seperator: . +src_repo: mike-fabian/ibus-typing-booster +tag_prefix: ^ +separator: .