Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2013-11-04 08:49:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-09-29 17:48:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-11-04 08:49:22.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Nov 2 07:31:38 UTC 2013 - [email protected] + +- fix bnc#848694: fcitx still use the old gtk_immodule_post/postun + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx.spec ++++++ --- /var/tmp/diff_new_pack.G5QBs6/_old 2013-11-04 08:49:23.000000000 +0100 +++ /var/tmp/diff_new_pack.G5QBs6/_new 2013-11-04 08:49:23.000000000 +0100 @@ -504,32 +504,16 @@ %{__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 @@ fi %postun gtk3 -%{_gtk3_query_immodules_update_cache} +%gtk3_immodule_postun %endif ++++++ xim.d-fcitx ++++++ --- /var/tmp/diff_new_pack.G5QBs6/_old 2013-11-04 08:49:23.000000000 +0100 +++ /var/tmp/diff_new_pack.G5QBs6/_new 2013-11-04 08:49:23.000000000 +0100 @@ -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 @@ 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
