public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Takao Fujiwara <tfujiwar@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ibus] autotool: Resolves #2321990 Move xinit post scripts
Date: Sun, 31 May 2026 02:08:45 GMT [thread overview]
Message-ID: <178019332543.1.18288807402338840917.rpms-ibus-da7fce084d2c@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ibus
Branch : autotool
Commit : da7fce084d2cd6bc6d96bc4a1269245a0e7b6750
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date : 2024-10-31T21:00:34+09:00
Stats : +13/-6 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/ibus/c/da7fce084d2cd6bc6d96bc4a1269245a0e7b6750?branch=autotool
Log:
Resolves #2321990 Move xinit post scripts
---
diff --git a/ibus.spec b/ibus.spec
index 7883bc1..3c84b07 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -62,7 +62,7 @@
Name: ibus
Version: 1.5.31~rc1
# 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
@@ -449,21 +449,25 @@ make check \
VERBOSE=1 \
%{nil}
-%post
+%post xinit
%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 83 || :
%postun
if [ "$1" -eq 0 ]; then
- %{_sbindir}/alternatives --remove xinputrc %{_xinputconf} || :
- # if alternative was set to manual, reset to auto
- [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || :
-
# 'dconf update' sometimes does not update the db...
dconf update || :
[ -f %{_sysconfdir}/dconf/db/ibus ] && \
rm %{_sysconfdir}/dconf/db/ibus || :
fi
+%postun xinit
+if [ "$1" -eq 0 ]; then
+ %{_sbindir}/alternatives --remove xinputrc %{_xinputconf} || :
+ # if alternative was set to manual, reset to auto
+ [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || :
+fi
+
+
%posttrans
dconf update || :
@@ -614,6 +618,9 @@ dconf update || :
%{_datadir}/installed-tests/ibus
%changelog
+* Thu Oct 31 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.31~rc1-2
+- Resolves #2321990 Move xinit post scripts
+
* Wed Oct 23 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.31~rc1-1
- Update compose tables
- Fix Unicode logic
reply other threads:[~2026-05-31 2:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=178019332543.1.18288807402338840917.rpms-ibus-da7fce084d2c@fedoraproject.org \
--to=tfujiwar@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