|
|
|
|
@ -60,18 +60,17 @@
|
|
|
|
|
%global dbus_python_version 0.83.0
|
|
|
|
|
|
|
|
|
|
Name: ibus
|
|
|
|
|
Version: 1.5.31~beta1
|
|
|
|
|
Version: 1.5.31
|
|
|
|
|
# https://github.com/fedora-infra/rpmautospec/issues/101
|
|
|
|
|
Release: 13%{?dist}
|
|
|
|
|
Release: 3%{?dist}
|
|
|
|
|
Summary: Intelligent Input Bus for Linux OS
|
|
|
|
|
License: LGPL-2.1-or-later
|
|
|
|
|
URL: https://github.com/ibus/%name/wiki
|
|
|
|
|
Source0: https://github.com/ibus/%name/releases/download/%{source_version}/%{name}-%{source_version}.tar.gz
|
|
|
|
|
Source1: https://github.com/ibus/%name/releases/download/%{source_version}/%{name}-%{source_version}.tar.gz.sum
|
|
|
|
|
Source1: https://github.com/ibus/%name/releases/download/%{source_version}/%{name}-%{source_version}.tar.gz.sum#/%{name}.tar.gz.sum
|
|
|
|
|
Source2: %{name}-xinput
|
|
|
|
|
Source3: %{name}.conf.5
|
|
|
|
|
# Patch0: %%{name}-HEAD.patch
|
|
|
|
|
Patch0: %{name}-HEAD.patch
|
|
|
|
|
# Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577
|
|
|
|
|
Patch1: %{name}-1385349-segv-bus-proxy.patch
|
|
|
|
|
|
|
|
|
|
@ -302,7 +301,7 @@ The ibus-devel-docs package contains developer documentation for IBus
|
|
|
|
|
%package desktop-testing
|
|
|
|
|
Summary: Wrapper of InstalledTests Runner for IBus
|
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
%if 0%{?fedora:1}%{?rhel:0}
|
|
|
|
|
%if (0%{?fedora} || 0%{?rhel} > 9)
|
|
|
|
|
# Use no-overview mode in CI to get input focus
|
|
|
|
|
BuildRequires: gnome-shell-extension-no-overview
|
|
|
|
|
Requires: gnome-shell-extension-no-overview
|
|
|
|
|
@ -380,6 +379,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 \
|
|
|
|
|
@ -436,6 +436,26 @@ HAS_PREFIX=$(grep prefix $RPM_BUILD_ROOT%{_bindir}/ibus-setup | wc -l)
|
|
|
|
|
[ x"$HAS_PREFIX" == x1 ] && \
|
|
|
|
|
sed -i -e '/prefix/d' $RPM_BUILD_ROOT%{_bindir}/ibus-setup
|
|
|
|
|
|
|
|
|
|
# Export GSK_RENDERER=cairo in CentOS only as a workaround.
|
|
|
|
|
# Not sure but seems mesa-vulkan-drivers is not configured correctly in
|
|
|
|
|
# CentOS and GTK is failed in CentOS CI:
|
|
|
|
|
# ibus-compose:10228: Gdk-WARNING **:
|
|
|
|
|
# Vulkan: ../src/imagination/vulkan/pvr_device.c:854:
|
|
|
|
|
# Failed to enumerate drm devices
|
|
|
|
|
# (errno 2: Δεν υπάρχει τέτοιο αρχείο ή κατάλογος)
|
|
|
|
|
# (VK_ERROR_INITIALIZATION_FAILED)
|
|
|
|
|
# https://www.linux.org.ru/forum/desktop/17554505
|
|
|
|
|
%if 0%{?rhel} > 9
|
|
|
|
|
if [ -f /etc/centos-release ] ; then
|
|
|
|
|
sed -i.bak -e '/^TESTING_RUNNER=/a\
|
|
|
|
|
export GSK_RENDERER=cairo' \
|
|
|
|
|
$RPM_BUILD_ROOT%{_libexecdir}/ibus-desktop-testing-autostart
|
|
|
|
|
diff $RPM_BUILD_ROOT%{_libexecdir}/ibus-desktop-testing-autostart* || :
|
|
|
|
|
ls -l $RPM_BUILD_ROOT%{_libexecdir}/ibus-desktop-testing-autostart*
|
|
|
|
|
rm $RPM_BUILD_ROOT%{_libexecdir}/ibus-desktop-testing-autostart.bak
|
|
|
|
|
fi
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
desktop-file-install --delete-original \
|
|
|
|
|
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
|
|
|
|
$RPM_BUILD_ROOT%{_datadir}/applications/*
|
|
|
|
|
@ -449,21 +469,24 @@ 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 +637,20 @@ dconf update || :
|
|
|
|
|
%{_datadir}/installed-tests/ibus
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Thu Nov 14 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.31-3
|
|
|
|
|
- Rebuild to export GSK_RENDERER=cairo in CentOS but not RHEL for Vulkan
|
|
|
|
|
|
|
|
|
|
* Wed Nov 13 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.31-2
|
|
|
|
|
- Move gnome-calendar & gnome-epub-thumbnailer to Fedora specific in CI
|
|
|
|
|
|
|
|
|
|
* Tue Nov 12 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.31-1
|
|
|
|
|
- Bump to 1.5.31
|
|
|
|
|
- Delete RHEL specific packages
|
|
|
|
|
- Update installed packages in CI
|
|
|
|
|
- configure option for Flatpak build
|
|
|
|
|
- Move xinit post scripts
|
|
|
|
|
- Require gnome-shell-extension-no-overview in RHEL
|
|
|
|
|
|
|
|
|
|
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.5.31~beta1-13
|
|
|
|
|
- Bump release for October 2024 mass rebuild:
|
|
|
|
|
Resolves: RHEL-64018
|
|
|
|
|
|
MSVSphere Packaging Team
4 weeks ago
