[rpms/ibus] autotool: Fix flatpak build

[rpms/ibus] autotool: Fix flatpak build

[Yaakov Selkowitz]

            A new commit has been pushed.

            Repo   : rpms/ibus
            Branch : autotool
            Commit : 1440c3c8d889ecee345ba7d94a085f12eba77cd7
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2025-03-24T17:06:43-04:00
            Stats  : +5/-2 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/ibus/c/1440c3c8d889ecee345ba7d94a085f12eba77cd7?branch=autotool

            Log:
            Fix flatpak build

As of Fedora 42, gtk2 is no longer in the runtime, and so ibus needs to be
rebuilt in /app in order for ibus-gtk2 to be available for gtk2-based
applications.  However, even when doing so, glib2 remains in the runtime and
is therefore in /usr even when building for /app:

https://docs.fedoraproject.org/en-US/packaging-guidelines/#_file_and_directory_dependencies

---
diff --git a/ibus.spec b/ibus.spec
index 2ca8352..dbf2752 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -50,7 +50,7 @@
 %else
 %{!?gtk4_binary_version: %global gtk4_binary_version ?.?.?}
 %endif
-%global glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
+%global glib_ver %([ -a /usr/%{_lib}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
 %else
 %{!?gtk2_binary_version: %global gtk2_binary_version ?.?.?}
 %{!?gtk3_binary_version: %global gtk3_binary_version ?.?.?}
@@ -63,7 +63,7 @@
 Name:           ibus
 Version:        1.5.32~rc2
 # https://github.com/fedora-infra/rpmautospec/issues/101
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.1-or-later
 URL:            https://github.com/ibus/%name/wiki
@@ -637,6 +637,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Mon Mar 24 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 1.5.32~rc2-2
+- Fix flatpak build
+
 * Wed Mar 19 2025 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.32~rc2-1
 - Resolves #2341930 Clear object pointers with task free in engineproxy
 - Update Unicode table with keysym

[rpms/ibus] autotool: Fix flatpak build

[Yaakov Selkowitz]

            A new commit has been pushed.

            Repo   : rpms/ibus
            Branch : autotool
            Commit : a6b902b14a6472e3ea5ee13f381c691cf6ebb091
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2024-10-06T08:47:23+09:00
            Stats  : +1/-0 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/ibus/c/a6b902b14a6472e3ea5ee13f381c691cf6ebb091?branch=autotool

            Log:
            Fix flatpak build

python3-gobject is included in the Fedora flatpak runtime and is therefore
in /usr, but when ibus is built for flatpaks it installs to /app.

https://src.fedoraproject.org/rpms/ibus/pull-request/39

---
diff --git a/ibus.spec b/ibus.spec
index be4487a..b1c998b 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -380,6 +380,7 @@ autoreconf -f -i -v
 %else
     --enable-python-library \
 %endif
+    --with-python-overrides-dir=%{python3_sitearch}/gi/overrides \
     --enable-wayland \
     --enable-introspection \
     --enable-install-tests \