diff --git a/baselibs.conf b/baselibs.conf index d883d8f..4514249 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -4,14 +4,14 @@ uim recommends "uim-qt4- = " uim-gtk2 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" requires "uim- = " supplements "packageand(uim:gtk2-)" diff --git a/uim.changes b/uim.changes index d946fd8..461e670 100644 --- a/uim.changes +++ b/uim.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) + ------------------------------------------------------------------- Sat Aug 24 04:37:14 UTC 2013 - ftake@geeko.jp diff --git a/uim.spec b/uim.spec index 039b860..cce6366 100644 --- a/uim.spec +++ b/uim.spec @@ -1,7 +1,7 @@ # # spec file for package uim # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -136,6 +136,13 @@ Qt4 input module plugin for uim %patch4 -p1 cp emacs/README README.emacs iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs +# 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 %build %configure --disable-static --with-pic \