Mailinglist Archive: opensuse-commit (1130 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package ibus for openSUSE:Factory
checked in at Tue Aug 9 10:54:37 CEST 2011.



--------
--- ibus/ibus.changes   2011-06-27 14:23:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/ibus/ibus.changes      2011-08-08 
16:34:51.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug  8 16:34:13 CEST 2011 - tiwai@xxxxxxx
+
+- Fix baselibs.conf to update GTK immodule cache properly for
+  ibus-gtk-32bit and ibus-gtk3-32bit packages, too
+- Clean up spec file
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ibus.spec ++++++
--- /var/tmp/diff_new_pack.rheLFJ/_old  2011-08-09 10:53:29.000000000 +0200
+++ /var/tmp/diff_new_pack.rheLFJ/_new  2011-08-09 10:53:29.000000000 +0200
@@ -16,10 +16,11 @@
 #
 
 
+%define build_gtk3 (0%{suse_version} >= 1140)
 
 Name:           ibus
 Version:        1.3.9
-Release:        3
+Release:        5
 License:        LGPL V2+
 Url:            http://code.google.com/p/ibus/
 Source0:        http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
@@ -69,11 +70,10 @@
 %description gtk
 This package contains ibus im module for gtk2
 
-%if %suse_version >= 1140
+%if %{build_gtk3}
 
 %package gtk3
 
-
 Summary:        IBus im module for gtk3
 Group:          System/I18n/Chinese
 Requires:       %{name} = %{version}
@@ -109,7 +109,7 @@
 autoreconf -fi
 intltoolize -f
 %configure --disable-static \
-%if %suse_version >= 1140
+%if %{build_gtk3}
                --enable-gtk3 \
 %endif
                   --disable-iso-codes-check \
@@ -172,7 +172,7 @@
 
 %postun -n libibus2 -p /sbin/ldconfig
 
-%if %suse_version >= 1140
+%if %{build_gtk3}
 
 %post gtk3
 %gtk3_immodule_post

++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.rheLFJ/_old  2011-08-09 10:53:29.000000000 +0200
+++ /var/tmp/diff_new_pack.rheLFJ/_new  2011-08-09 10:53:29.000000000 +0200
@@ -1,3 +1,25 @@
 ibus-gtk
+  post "%if "%_lib" == "lib64""
+  post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > 
<prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
+  post "%else"
+  post "<prefix>%{_bindir}/gtk-query-immodules-2.0 > 
<prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
+  post "%endif"
+  postun "%if "%_lib" == "lib64""
+  postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > 
<prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
+  postun "%else"
+  postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > 
<prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
+  postun "%endif"
+  supplements "packageand(ibus:gtk2-<targettype>)"
 ibus-gtk3
-libibus2
\ No newline at end of file
+  post "%if "%_lib" == "lib64""
+  post "<prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache"
+  post "%else"
+  post "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache"
+  post "%endif"
+  postun "%if "%_lib" == "lib64""
+  postun "<prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache"
+  postun "%else"
+  postun "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache"
+  postun "%endif"
+  supplements "packageand(ibus:gtk3-<targettype>)"
+libibus2


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx