diff --git a/fcitx.changes b/fcitx.changes index 286fdb2..a498b92 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 2 07:31:38 UTC 2013 - i@marguerite.su + +- fix bnc#848694: fcitx still use the old gtk_immodule_post/postun + ------------------------------------------------------------------- Sat Sep 28 09:02:48 UTC 2013 - i@marguerite.su diff --git a/fcitx.spec b/fcitx.spec index f209a81..dd62eb0 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -504,32 +504,16 @@ fdupes -n -q -r %{buildroot} %{__strip} %{buildroot}%{_libdir}/gtk-3.0/*/immodules/im-%{name}.so %endif -# Convenient define for the scriplets -%if %{_lib} == lib64 -%define _gtk2_query_immodules %{_bindir}/gtk-query-immodules-2.0-64 -%define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules} > %{_sysconfdir}/gtk-2.0/gtk64.immodules -%else -%define _gtk2_query_immodules %{_bindir}/gtk-query-immodules-2.0 -%define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules} > %{_sysconfdir}/gtk-2.0/gtk.immodules -%endif - %post gtk2 -%{_gtk2_query_immodules_update_cache} +%gtk2_immodule_post %postun gtk2 -%{_gtk2_query_immodules_update_cache} +%gtk2_immodule_postun %if 0%{?suse_version} >= 1140 || 0%{?fedora_version} -%if %{_lib} == lib64 -%define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0-64 -%else -%define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0 -%endif -%define _gtk3_query_immodules_update_cache %{_gtk3_query_immodules} --update-cache - %post gtk3 -%{_gtk3_query_immodules_update_cache} +%gtk3_immodule_post # Add fcitx icons to gnome3 panel TARGET="/usr/share/gnome-shell/js/ui/statusIconDispatcher.js" @@ -539,7 +523,7 @@ sed "/^const STANDARD_TRAY_ICON_IMPLEMENTATIONS/a \ 'fcitx': 'input-method'," fi %postun gtk3 -%{_gtk3_query_immodules_update_cache} +%gtk3_immodule_postun %endif diff --git a/xim.d-fcitx b/xim.d-fcitx index a956e93..ee1b53d 100644 --- a/xim.d-fcitx +++ b/xim.d-fcitx @@ -1,6 +1,5 @@ if ! type -p fcitx > /dev/null 2>&1 ; then - echo "fcitx is not available." - PATH=$OLD_PATH + echo "fcitx is not installed. please run `sudo zypper in fcitx`." return 1 fi @@ -10,7 +9,6 @@ if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then fi export LC_CTYPE=$LANG -# So you can use either zh_CN.UTF-8 or zh_CN.GB2312 export XMODIFIERS="@im=fcitx" export GTK_IM_MODULE=fcitx export GTK3_IM_MODULE=fcitx