From 3479dff7f61d7b5bbebcdeb72c99e05cf48c82ae Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 31 Jan 2023 20:54:30 -0500 Subject: [PATCH] Split out gtk-immodules-imsettings subpackage Both gtk2-immodules and gtk3-immodules want this imsettings file, but with fewer packages still using gtk2 we do not want to always force the presence of both through an interdependency. --- gtk2.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gtk2.spec b/gtk2.spec index 8947368..8bc6907 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -20,7 +20,7 @@ Summary: GTK+ graphical user interface library Name: gtk2 Version: 2.24.33 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPLv2+ URL: http://www.gtk.org #VCS: git:git://git.gnome.org/gtk+#gtk-2-24 @@ -102,11 +102,20 @@ suites. %package immodules Summary: Input methods for GTK+ Requires: gtk2 = %{version}-%{release} +Requires: gtk-immodules-imsettings %description immodules The gtk2-immodules package contains standalone input methods that are shipped as part of GTK+. +%package -n gtk-immodules-imsettings +Summary: IMSettings config files for GTK+ input methods +Conflicts: gtk2 < 2.24.33-12 + +%description -n gtk-immodules-imsettings +The gtk-immodules-imsettings package contains IMSettings configuration for the +standalone input methods that are shipped as part of GTK+. + %package immodule-xim Summary: XIM support for GTK+ Requires: gtk2 = %{version}-%{release} @@ -296,10 +305,12 @@ gtk-query-immodules-2.0-%{__isa_bits} --update-cache %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ti-er.so %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ti-et.so %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-viqr.so -%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf %dir %{_sysconfdir}/gtk-2.0 %config(noreplace) %{_sysconfdir}/gtk-2.0/im-multipress.conf +%files -n gtk-immodules-imsettings +%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf + %files immodule-xim %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-xim.so @@ -322,6 +333,9 @@ gtk-query-immodules-2.0-%{__isa_bits} --update-cache %doc tmpdocs/examples %changelog +* Wed Feb 01 2023 Yaakov Selkowitz - 2.24.33-12 +- Split out gtk-immodules-imsettings subpackage + * Thu Jan 19 2023 Fedora Release Engineering - 2.24.33-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild