public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ibus] autotool: Fix flatpak build
Date: Sun, 31 May 2026 02:08:54 GMT [thread overview]
Message-ID: <178019333468.1.17268142394912988827.rpms-ibus-1440c3c8d889@fedoraproject.org> (raw)
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
next reply other threads:[~2026-05-31 2:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-31 2:08 Yaakov Selkowitz [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-05-31 2:08 [rpms/ibus] autotool: Fix flatpak build Yaakov Selkowitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178019333468.1.17268142394912988827.rpms-ibus-1440c3c8d889@fedoraproject.org \
--to=yselkowi@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox