New sub package ibus-xinit for RHEL not to depend on xorg-x11-xinit

ibus.spec

@@ -18,8 +18,10 @@
 # No gtk2 in RHEL 10
 %if 0%{?rhel} > 9
 %bcond_with    gtk2
+%bcond_with    xinit
 %else
 %bcond_without gtk2
+%bcond_without xinit
 %endif
 
 %if (0%{?fedora} > 33 || 0%{?rhel} > 8)
@@ -59,7 +61,7 @@
 Name:           ibus
 Version:        1.5.30~rc3
 # 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
@@ -68,9 +70,9 @@ Source1:        %{name}-xinput
 Source2:        %{name}.conf.5
 # Patch0:         %%{name}-HEAD.patch
 # #2267615
-Patch2:         %{name}-2267615-wayland-init-keymap.patch
+Patch1:         %{name}-2267615-wayland-init-keymap.patch
 # Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577
-Patch1:         %{name}-1385349-segv-bus-proxy.patch
+Patch2:         %{name}-1385349-segv-bus-proxy.patch
 %if 0%{?fedora:0}%{?rhel:1}
 # Use mutter window manager in RHEL CI
 Patch100:       %{name}-xx-desktop-testing-mutter.patch
@@ -131,8 +133,10 @@ Requires:       dconf
 Requires:       python3-gobject
 # https://bugzilla.redhat.com/show_bug.cgi?id=1161871
 %{?__python3:Requires: %{__python3}}
+%if %{with xinit}
 # Owner of %%{_sysconfdir}/X11/xinit
 Requires:       xorg-x11-xinit
+%endif
 Requires:       setxkbmap
 %if (0%{?fedora} > 29 || 0%{?rhel} > 8)
 %else
@@ -258,8 +262,11 @@ This package contains IBus IM module for Wayland
 
 %package panel
 Summary:        IBus Panel icon
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa}        = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa}   = %{version}-%{release}
+%if %{without xinit}
+Requires:       %{name}-xinit          = %{version}-%{release}
+%endif
 BuildRequires:  libdbusmenu-gtk3-devel
 
 %description panel
@@ -268,6 +275,17 @@ in non-GNOME desktop sessions likes XFCE or Plasma because gnome-shell
 shows the IBus Icon. This package depends on libdbusmenu-gtk3 for Wayland
 desktop sessions.
 
+%if %{without xinit}
+%package xinit
+Summary:        IBus Xinit
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
+
+%description xinit
+This package includes xinit scripts to set environment variables of IBus
+for Xorg desktop sessions and this is not needed by Wayland desktop sessions.
+%endif
+
 %package devel
 Summary:        Development tools for ibus
 Requires:       %{name}-libs%{?_isa}   = %{version}-%{release}
@@ -479,7 +497,9 @@ dconf update || :
 %{_datadir}/man/man7/ibus-emoji.7.gz
 %{_datadir}/man/man5/00-upstream-settings.5.gz
 %{_datadir}/man/man5/ibus.5.gz
+%if %{with xinit}
 %{_datadir}/man/man5/ibus.conf.5.gz
+%endif
 %{_libexecdir}/ibus-engine-simple
 %{_libexecdir}/ibus-dconf
 %{_libexecdir}/ibus-portal
@@ -494,11 +514,13 @@ dconf update || :
 %{_prefix}/lib/systemd/user/org.freedesktop.IBus.session.*.service
 %python3_sitearch/gi/overrides/__pycache__/*.py*
 %python3_sitearch/gi/overrides/IBus.py
+%if %{with xinit}
 # ibus owns xinput.d because gnome does not like to depend on imsettings.
 %dir %{_sysconfdir}/X11/xinit/xinput.d
 # Do not use %%config(noreplace) to always get the new keywords in _xinputconf
 # For user customization, $HOME/.xinputrc can be used instead.
 %config %{_xinputconf}
+%endif
 %verify(not mtime) %dir %pkgcache
 %verify(not mtime) %dir %pkgcache/bus
 # 'ibus write-cache --system' updates the system cache.
@@ -552,6 +574,15 @@ dconf update || :
 %{_datadir}/applications/org.freedesktop.IBus.Panel.Wayland.Gtk3.desktop
 %{_libexecdir}/ibus-ui-gtk3
 
+%if %{without xinit}
+%files xinit
+%{_datadir}/man/man5/ibus.conf.5.gz
+# ibus owns xinit directory without xorg-x11-xinit package
+%dir %{_sysconfdir}/X11/xinit
+%dir %{_sysconfdir}/X11/xinit/xinput.d
+%config %{_xinputconf}
+%endif
+
 %files devel
 %{_libdir}/ibus
 %{_libdir}/lib*.so
@@ -583,6 +614,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Fri Apr 12 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.30~rc3-2
+- New sub package ibus-xinit for RHEL not to depend on xorg-x11-xinit
+
 * Tue Apr 02 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.30~rc3-1
 - Delete upstreamed patches