From b66754691c3625c89bf9b472b39a0195540e58578afb5c4867701ce3d7b8a8bf Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Mon, 31 Jul 2023 11:08:48 +0000 Subject: [PATCH] Accepting request 1101509 from home:mike-fabian Do not include the inscript2 input methods anymore on Tumbleweed as they are already included in m17n-db >= 1.8.2 OBS-URL: https://build.opensuse.org/request/show/1101509 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus-typing-booster?expand=0&rev=234 --- ibus-typing-booster.changes | 7 +++++++ ibus-typing-booster.spec | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/ibus-typing-booster.changes b/ibus-typing-booster.changes index f7faf32..a152753 100644 --- a/ibus-typing-booster.changes +++ b/ibus-typing-booster.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jul 31 12:49:52 UTC 2023 - maiku.fabian@gmail.com + +- Include inscript2 input methods only for suse_version < 1550 + i.e. do not include it on Tumbleed anymore. Because Tumbleweed + has m17n-db-1.8.2 which has the inscript2 input methods already. + ------------------------------------------------------------------- Sun Jul 30 11:23:12 UTC 2023 - maiku.fabian@gmail.com diff --git a/ibus-typing-booster.spec b/ibus-typing-booster.spec index 4a510cd..41d235c 100644 --- a/ibus-typing-booster.spec +++ b/ibus-typing-booster.spec @@ -94,8 +94,10 @@ input method to speedup typing. %prep %setup -q +%if 0%{?suse_version} < 1550 ##extract inscript2 maps tar xzf %{SOURCE1} +%endif %build export PYTHON=%{_bindir}/python3 @@ -109,10 +111,12 @@ gzip -n --force --best %{buildroot}/%{_datadir}/%{name}/data/*.{txt,json} \ %{buildroot}/%{_datadir}/%{name}/data/annotations/*.xml \ %{buildroot}/%{_datadir}/%{name}/data/annotationsDerived/*.xml +%if 0%{?suse_version} < 1550 #install inscript2 keymaps test -d %{buildroot}%{_datadir}/m17n/icons || mkdir -p %{buildroot}%{_datadir}/m17n/icons cp -p inscript2/IM/* %{buildroot}%{_datadir}/m17n/ cp -p inscript2/icons/* %{buildroot}%{_datadir}/m17n/icons +%endif %suse_update_desktop_file -i -u emoji-picker GTK Utility @@ -214,9 +218,11 @@ fi %{_libdir}/ibus/ibus-setup-typing-booster %{_datadir}/applications/*.desktop %{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.engine.typing-booster.gschema.xml +%if 0%{?suse_version} < 1550 %dir %{_datadir}/m17n %{_datadir}/m17n/*.mim %dir %{_datadir}/m17n/icons %{_datadir}/m17n/icons/*.png +%endif %changelog