Compare commits

...

4 Commits

Author SHA1 Message Date
Yaakov Selkowitz 94932ce605 Make the gtk-immodules-imsettings subpackage noarch 2023-02-01 11:47:09 -05:00
Yaakov Selkowitz 3479dff7f6 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.
2023-02-01 10:04:22 -05:00
Fedora Release Engineering 15304ac572 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 11:45:44 +00:00
Lumir Balhar e5446cff4e Change location of pathfix.py
For more info see https://fedoraproject.org/wiki/Changes/Python3.12#pathfix.py_tool_will_be_removed
2022-11-01 07:04:40 +01:00
1 changed files with 24 additions and 3 deletions

View File

@ -20,7 +20,7 @@
Summary: GTK+ graphical user interface library
Name: gtk2
Version: 2.24.33
Release: 10%{?dist}
Release: 13%{?dist}
License: LGPLv2+
URL: http://www.gtk.org
#VCS: git:git://git.gnome.org/gtk+#gtk-2-24
@ -102,11 +102,21 @@ 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
BuildArch: noarch
%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}
@ -236,7 +246,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
cp %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
# Use python3 shebang instead of ambiguous python
pathfix.py -pn -i %{__python3} $RPM_BUILD_ROOT%{_bindir}/gtk-builder-convert
%{__python3} %{_rpmconfigdir}/redhat/pathfix.py -pn -i %{__python3} $RPM_BUILD_ROOT%{_bindir}/gtk-builder-convert
# Remove unpackaged files
rm $RPM_BUILD_ROOT%{_libdir}/*.la
@ -296,10 +306,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 +334,15 @@ gtk-query-immodules-2.0-%{__isa_bits} --update-cache
%doc tmpdocs/examples
%changelog
* Wed Feb 01 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2.24.33-13
- Make the gtk-immodules-imsettings subpackage noarch
* Wed Feb 01 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2.24.33-12
- Split out gtk-immodules-imsettings subpackage
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.24.33-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jul 27 2022 Tomas Popela <tpopela@redhat.com> - 2.24.33-10
- Fix FTBFS on F37/rawhide as apparently autoconf is not using ibm, but
redhat in the host triplet