Merge commit '491f2abc754dde52397961379701417224da80092abf7410a1ac30239511411c' into slfo-main

OBS-URL: https://build.opensuse.org/request/show/1285985
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ibus?expand=0&rev=131

20-ibus-plasma-setup.sh

@@ -10,12 +10,12 @@ desktop_file="/usr/share/applications/org.freedesktop.IBus.Panel.Wayland.Gtk3.de
 
 # Do nothing for X11 session
 if [ "$XDG_SESSION_TYPE" != "wayland" ]; then
-    return 0
+    exit 0
 fi
 
 # Do nothing if kreadconfig6 is not available
 if ! command -v kreadconfig6 >/dev/null 2>&1; then
-    return 0
+    exit 0
 fi
 
 # check current virtual keyboard

ibus.changes

@@ -1,44 +1,3 @@
--------------------------------------------------------------------
-Mon Jan 19 02:51:42 UTC 2026 - Cliff Zhao <qzhao@suse.com>
-
-- Update ibus.spec to get rid of update-desktop-files:
-  * It often duplicates upstream translation effort, wasting a human
-    work, both community translators and contracted ones.
-  * Most of these translations are ~20 years old, and they were never
-    reviewed, so it is possible that they are worse than the upstream
-    ones. In the last 20 years it did not provide any way to upstream
-    the changes and translations. The upstream translations got another
-    20 years of development. Also Desktop Categories specification was
-    updated, and the upstream specification now covers all aspects of
-    former X-SuSE-* Categories extensions.
-  * As a result, the SUSE desktop menu experience differs from other
-    vendors. Applications have a different name, different translations,
-    different placement in the structured menu etc.
-  * Upstream translations have a wider impact.
-  * Package maintainers have only a limited control over the contents
-    visible to users. It is imported during the runtime, and the visible
-    contents could be different from the contents in the package.
-  * update-desktop-files is a complicated tool. It attempts to fix
-    deprecated and obsolete stuff in the desktop files without even
-    informing the developer that something was wrong and something was
-    modified.
-  * It uses a very complicated toolchain that requires access to SUSE
-    intranet and access to OpenQA VPN. The complete toolchain setup was
-    never published, so it has even problems with Open Source ideas.
-  * It mixes SUSE-unique translations with translations that just
-    duplicate the upstream translation effort. As a result it significantly
-    increases number of strings to translate and decreases the quality of
-    the translation.
-  (jsc#PED-14507)
-
--------------------------------------------------------------------
-Tue Dec 16 15:55:11 UTC 2025 - Giacomo Comes <gcomes.obs@gmail.com>
-
-- use return insted of exit in 20-ibus-plasma-setup.sh
-  * such script is sourced not executed, when using exit other 
-    scripts in the same directory are not sourced anymore
-  * fix boo#1255237
-
 -------------------------------------------------------------------
 Wed Nov 19 14:14:39 UTC 2025 - Fuminobu Takeyama <ftake@geeko.jp> - 1.5.33
 

ibus.spec

@@ -1,7 +1,8 @@
 #
 # spec file for package ibus
 #
-# Copyright (c) 2026 SUSE LLC and contributors
+# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -84,6 +85,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  python3-dbus-python-devel
 BuildRequires:  python3-gobject-devel
 BuildRequires:  unicode-ucd
+BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(dconf) >= 0.7.5
 BuildRequires:  pkgconfig(gtk+-2.0)
@@ -299,6 +301,8 @@ touch %{buildroot}/%{_sysconfdir}/dconf/db/ibus
 mkdir -p %{buildroot}%{_rpmmacrodir}
 install -m 644 %{SOURCE7} %{buildroot}%{_rpmmacrodir}
 
+%suse_update_desktop_file -r org.freedesktop.IBus.Setup Settings DesktopSettings X-SuSE-Core-System
+
 %fdupes %{buildroot}
 
 %find_lang ibus10 %{?no_lang_C}