Fix conflict with gtk2-immodules
This commit is contained in:
parent
e6358d428f
commit
0cd1423fb4
16
gtk3.spec
16
gtk3.spec
@ -15,13 +15,12 @@
|
|||||||
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
|
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
|
||||||
Name: gtk3
|
Name: gtk3
|
||||||
Version: 3.7.6
|
Version: 3.7.6
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://www.gtk.org
|
URL: http://www.gtk.org
|
||||||
#VCS: git:git://git.gnome.org/gtk+
|
#VCS: git:git://git.gnome.org/gtk+
|
||||||
Source: http://download.gnome.org/sources/gtk+/3.7/gtk+-%{version}.tar.xz
|
Source: http://download.gnome.org/sources/gtk+/3.7/gtk+-%{version}.tar.xz
|
||||||
Source1: im-cedilla.conf
|
|
||||||
|
|
||||||
# fixes for 3.7.6 bugs
|
# fixes for 3.7.6 bugs
|
||||||
Patch0: 0001-window-allocation-x-y-is-0-0.patch
|
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+
|
Summary: Input methods for GTK+
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Requires: gtk3%{?_isa} = %{version}-%{release}
|
Requires: gtk3%{?_isa} = %{version}-%{release}
|
||||||
|
# for im-cedilla.conf
|
||||||
|
Requires: gtk2-immodules
|
||||||
|
|
||||||
%description immodules
|
%description immodules
|
||||||
The gtk3-immodules package contains standalone input methods that
|
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}
|
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
|
# Remove unpackaged files
|
||||||
rm $RPM_BUILD_ROOT%{_libdir}/*.la
|
rm $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||||
rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/*/*.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}
|
%dir %{_libdir}/gtk-3.0/%{bin_version}
|
||||||
%{_libdir}/gtk-3.0/%{bin_version}/theming-engines
|
%{_libdir}/gtk-3.0/%{bin_version}/theming-engines
|
||||||
%dir %{_libdir}/gtk-3.0/%{bin_version}/immodules
|
%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/%{bin_version}/printbackends
|
||||||
%{_libdir}/gtk-3.0/modules
|
%{_libdir}/gtk-3.0/modules
|
||||||
%{_libdir}/gtk-3.0/immodules
|
%{_libdir}/gtk-3.0/immodules
|
||||||
@ -227,8 +224,6 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
|
|||||||
%{_datadir}/themes/Emacs
|
%{_datadir}/themes/Emacs
|
||||||
%{_libdir}/girepository-1.0
|
%{_libdir}/girepository-1.0
|
||||||
%dir %{_sysconfdir}/gtk-3.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
|
%ghost %{_libdir}/gtk-3.0/%{bin_version}/immodules.cache
|
||||||
%{_mandir}/man1/gtk-query-immodules-3.0.1.gz
|
%{_mandir}/man1/gtk-query-immodules-3.0.1.gz
|
||||||
%{_mandir}/man1/gtk-launch.1.gz
|
%{_mandir}/man1/gtk-launch.1.gz
|
||||||
@ -240,6 +235,7 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files immodules
|
%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-am-et.so
|
||||||
%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-cyrillic-translit.so
|
%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-cyrillic-translit.so
|
||||||
%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-inuktitut.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
|
%{_datadir}/gtk-doc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 28 2013 Matthias Clasen <mclasen@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@redhat.com> - 3.7.6-3
|
* Thu Jan 24 2013 Matthias Clasen <mclasen@redhat.com> - 3.7.6-3
|
||||||
- Enable the Wayland and Broadway backends
|
- Enable the Wayland and Broadway backends
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user