diff --git a/baselibs.conf b/baselibs.conf index ce5471d..d48abc6 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,13 +1,13 @@ ibus-gtk post "%if "%_lib" == "lib64"" - post "%{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules" + post "%{_bindir}/gtk-query-immodules-2.0-64 --update-cache" post "%else" - post "%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules" + post "%{_bindir}/gtk-query-immodules-2.0 --update-cache" post "%endif" postun "%if "%_lib" == "lib64"" - postun "%{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules" + postun "%{_bindir}/gtk-query-immodules-2.0-64 --update-cache" postun "%else" - postun "%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules" + postun "%{_bindir}/gtk-query-immodules-2.0 --update-cache" postun "%endif" supplements "packageand(ibus:gtk2-)" ibus-gtk3 diff --git a/ibus.changes b/ibus.changes index 527870c..9fca63d 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 14 12:10:13 CET 2014 - tiwai@suse.de + +- Fix *-32bit post and postun calls for gtk-query-immodules-2 on + openSUSE 13.1 and later (bnc#845860) + ------------------------------------------------------------------- Mon Feb 10 09:48:56 UTC 2014 - fcrozat@suse.com diff --git a/ibus.spec b/ibus.spec index c99b8b4..32930c0 100644 --- a/ibus.spec +++ b/ibus.spec @@ -178,6 +178,13 @@ docs for ibus. %prep %setup -q %patch0 -p1 +# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860) +%if %suse_version < 1310 +sed -i \ + -e's@\(gtk-query-immodules-2.0-64\) --update-cache@\1 > %{_sysconfdir}/gtk-2.0/gtk64.immodules@g' \ + -e's@\(gtk-query-immodules-2.0\) --update-cache@\1 > %{_sysconfdir}/gtk-2.0/gtk.immodules@g' \ + $RPM_SOURCE_DIR/baselibs.conf +%endif %if %{with_automatic_config} %patch1 -p1