Hello community,
here is the log from the commit of package uim for openSUSE:Factory checked in
at 2014-02-15 08:07:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/uim (Old)
and /work/SRC/openSUSE:Factory/.uim.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "uim"
Changes:
--------
--- /work/SRC/openSUSE:Factory/uim/uim.changes 2013-09-02 15:03:19.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.uim.new/uim.changes 2014-02-15
08:07:38.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:
------------------
++++++ uim.spec ++++++
--- /var/tmp/diff_new_pack.KsMvdP/_old 2014-02-15 08:07:39.000000000 +0100
+++ /var/tmp/diff_new_pack.KsMvdP/_new 2014-02-15 08:07:39.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package uim
#
-# 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
@@ -136,6 +136,13 @@
%patch4 -p1
cp emacs/README README.emacs
iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs
+# 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
%configure --disable-static --with-pic \
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.KsMvdP/_old 2014-02-15 08:07:39.000000000 +0100
+++ /var/tmp/diff_new_pack.KsMvdP/_new 2014-02-15 08:07:39.000000000 +0100
@@ -4,14 +4,14 @@
recommends "uim-qt4-<targettype> = <version>"
uim-gtk2
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"
requires "uim-<targettype> = <version>"
supplements "packageand(uim:gtk2-<targettype>)"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
