Hello community, here is the log from the commit of package ibus for openSUSE:Factory checked in at 2014-02-15 08:05:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus (Old) and /work/SRC/openSUSE:Factory/.ibus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus/ibus.changes 2014-02-11 11:03:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ibus.new/ibus.changes 2014-02-15 08:05:07.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 14 12:10:13 CET 2014 - ti...@suse.de + +- Fix *-32bit post and postun calls for gtk-query-immodules-2 on + openSUSE 13.1 and later (bnc#845860) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus.spec ++++++ --- /var/tmp/diff_new_pack.8bOJpb/_old 2014-02-15 08:05:07.000000000 +0100 +++ /var/tmp/diff_new_pack.8bOJpb/_new 2014-02-15 08:05:07.000000000 +0100 @@ -178,6 +178,13 @@ %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 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules@g' \ + -e's@\(gtk-query-immodules-2.0\) --update-cache@\1 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules@g' \ + $RPM_SOURCE_DIR/baselibs.conf +%endif %if %{with_automatic_config} %patch1 -p1 ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.8bOJpb/_old 2014-02-15 08:05:07.000000000 +0100 +++ /var/tmp/diff_new_pack.8bOJpb/_new 2014-02-15 08:05:07.000000000 +0100 @@ -1,13 +1,13 @@ ibus-gtk post "%if "%_lib" == "lib64"" - post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules" + post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache" post "%else" - post "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules" + post "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache" post "%endif" postun "%if "%_lib" == "lib64"" - postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules" + postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache" postun "%else" - postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules" + postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache" postun "%endif" supplements "packageand(ibus:gtk2-<targettype>)" ibus-gtk3 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org