Accepting request 78313 from home:tiwai:branches:M17N

- Fix baselibs.conf to update GTK immodule cache properly for
  ibus-gtk-32bit and ibus-gtk3-32bit packages, too
- Clean up spec file

OBS-URL: https://build.opensuse.org/request/show/78313
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=24
This commit is contained in:
Takashi Iwai 2011-08-08 15:14:02 +00:00 committed by Git OBS Bridge
parent 5a70cc2dcf
commit 14afd4cc8b
3 changed files with 34 additions and 9 deletions

View File

@ -1,3 +1,25 @@
ibus-gtk
post "%if "%_lib" == "lib64""
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
post "%else"
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
post "%endif"
postun "%if "%_lib" == "lib64""
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
postun "%else"
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
postun "%endif"
supplements "packageand(ibus:gtk2-<targettype>)"
ibus-gtk3
libibus2
post "%if "%_lib" == "lib64""
post "<prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache"
post "%else"
post "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache"
post "%endif"
postun "%if "%_lib" == "lib64""
postun "<prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache"
postun "%else"
postun "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache"
postun "%endif"
supplements "packageand(ibus:gtk3-<targettype>)"
libibus2

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Aug 8 16:34:13 CEST 2011 - tiwai@suse.de
- Fix baselibs.conf to update GTK immodule cache properly for
ibus-gtk-32bit and ibus-gtk3-32bit packages, too
- Clean up spec file
-------------------------------------------------------------------
Mon Jun 27 14:21:46 CEST 2011 - tiwai@suse.de

View File

@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define build_gtk3 (0%{suse_version} >= 1140)
Name: ibus
Version: 1.3.9
@ -69,11 +69,8 @@ Supplements: packageand(ibus:gtk2)
%description gtk
This package contains ibus im module for gtk2
%if %suse_version >= 1140
%if %{build_gtk3}
%package gtk3
Summary: IBus im module for gtk3
Group: System/I18n/Chinese
Requires: %{name} = %{version}
@ -109,7 +106,7 @@ docs for ibus.
autoreconf -fi
intltoolize -f
%configure --disable-static \
%if %suse_version >= 1140
%if %{build_gtk3}
--enable-gtk3 \
%endif
--disable-iso-codes-check \
@ -172,8 +169,7 @@ rm -rf %buildroot
%postun -n libibus2 -p /sbin/ldconfig
%if %suse_version >= 1140
%if %{build_gtk3}
%post gtk3
%gtk3_immodule_post