Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2014-02-15 08:03:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-10 17:42:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2014-02-15 08:03:59.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 14 12:10:13 CET 2014 - [email protected] + +- Fix *-32bit post and postun calls for gtk-query-immodules-2 on + openSUSE 13.1 and later (bnc#845860) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx.spec ++++++ --- /var/tmp/diff_new_pack.njVdP8/_old 2014-02-15 08:04:00.000000000 +0100 +++ /var/tmp/diff_new_pack.njVdP8/_new 2014-02-15 08:04:00.000000000 +0100 @@ -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 @@ %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 > <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 %build mkdir build ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.njVdP8/_old 2014-02-15 08:04:00.000000000 +0100 +++ /var/tmp/diff_new_pack.njVdP8/_new 2014-02-15 08:04:00.000000000 +0100 @@ -7,14 +7,14 @@ fcitx-gtk2 requires "libfcitx-4_2_8-<targettype> = <version>" post "%if "%_lib" == "lib64"" - post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > %{_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 > %{_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 > %{_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 > %{_sysconfdir}/gtk-2.0/gtk.immodules" + postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache" postun "%endif" fcitx-gtk3 requires "libfcitx-4_2_8-<targettype> = <version>" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
