[gtk3] Fix conflict with gtk2-immodules
Matthias Clasen
mclasen at fedoraproject.org
Mon Jan 28 14:38:42 UTC 2013
commit 0cd1423fb461611a41e2a63ff07b75846b89ddfc
Author: Matthias Clasen <mclasen at redhat.com>
Date: Mon Jan 28 09:38:46 2013 -0500
Fix conflict with gtk2-immodules
gtk3.spec | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gtk3.spec b/gtk3.spec
index bb402af..fc3e879 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -15,13 +15,12 @@
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk3
Version: 3.7.6
-Release: 3%{?dist}
+Release: 4%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gtk.org
#VCS: git:git://git.gnome.org/gtk+
Source: http://download.gnome.org/sources/gtk+/3.7/gtk+-%{version}.tar.xz
-Source1: im-cedilla.conf
# fixes for 3.7.6 bugs
Patch0: 0001-window-allocation-x-y-is-0-0.patch
@@ -80,6 +79,8 @@ This package contains version 3 of GTK+.
Summary: Input methods for GTK+
Group: System Environment/Libraries
Requires: gtk3%{?_isa} = %{version}-%{release}
+# for im-cedilla.conf
+Requires: gtk2-immodules
%description immodules
The gtk3-immodules package contains standalone input methods that
@@ -164,9 +165,6 @@ make install DESTDIR=$RPM_BUILD_ROOT \
mv gtk-query-immodules-3.0 gtk-query-immodules-3.0-%{__isa_bits}
)
-# Input method frameworks want this
-install -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf
-
# Remove unpackaged files
rm $RPM_BUILD_ROOT%{_libdir}/*.la
rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/*/*.la
@@ -219,7 +217,6 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
%dir %{_libdir}/gtk-3.0/%{bin_version}
%{_libdir}/gtk-3.0/%{bin_version}/theming-engines
%dir %{_libdir}/gtk-3.0/%{bin_version}/immodules
-%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-cedilla.so
%{_libdir}/gtk-3.0/%{bin_version}/printbackends
%{_libdir}/gtk-3.0/modules
%{_libdir}/gtk-3.0/immodules
@@ -227,8 +224,6 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
%{_datadir}/themes/Emacs
%{_libdir}/girepository-1.0
%dir %{_sysconfdir}/gtk-3.0
-%dir %{_sysconfdir}/X11/xinit/xinput.d
-%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf
%ghost %{_libdir}/gtk-3.0/%{bin_version}/immodules.cache
%{_mandir}/man1/gtk-query-immodules-3.0.1.gz
%{_mandir}/man1/gtk-launch.1.gz
@@ -240,6 +235,7 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
%endif
%files immodules
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-cedilla.so
%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-am-et.so
%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-cyrillic-translit.so
%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-inuktitut.so
@@ -270,6 +266,10 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
%{_datadir}/gtk-doc
%changelog
+* Mon Jan 28 2013 Matthias Clasen <mclasen at redhat.com> - 3.7.6-4
+- Move im-cedilla back to -immodules subpackage to avoid
+ a conflict with gtk2-immodules (#797838)
+
* Thu Jan 24 2013 Matthias Clasen <mclasen at redhat.com> - 3.7.6-3
- Enable the Wayland and Broadway backends
More information about the scm-commits
mailing list