diff --git a/baselibs.conf b/baselibs.conf index 551a4dd..bd5eeeb 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -7,14 +7,14 @@ libfcitx-4_2_8 fcitx-gtk2 requires "libfcitx-4_2_8- = " 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" fcitx-gtk3 requires "libfcitx-4_2_8- = " diff --git a/fcitx.changes b/fcitx.changes index 316cc3b..7ba32d8 100644 --- a/fcitx.changes +++ b/fcitx.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 Dec 7 04:23:04 UTC 2013 - swyear@gmail.com diff --git a/fcitx.spec b/fcitx.spec index dd62eb0..721b374 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -1,7 +1,7 @@ # # spec file for package fcitx # -# 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 @@ -368,6 +368,13 @@ You can either use this package for download from kde-look.org using knewstaff i %prep %setup -q -n %{name}-%{version} +# 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 mkdir build