Hello community,
here is the log from the commit of package ibus for openSUSE:Factory
checked in at Mon Sep 19 21:23:09 CEST 2011.
--------
--- ibus/ibus.changes 2011-08-08 16:34:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/ibus/ibus.changes 2011-09-06
19:23:26.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep 6 17:17:56 UTC 2011 - ft...@geeko.jp
+
+- Fix xim.d/ibus to launch D-Bus daemon (only for newer D-Bus)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
xim.d-ibus-121
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ibus.spec ++++++
--- /var/tmp/diff_new_pack.03vcSK/_old 2011-09-19 21:23:06.000000000 +0200
+++ /var/tmp/diff_new_pack.03vcSK/_new 2011-09-19 21:23:06.000000000 +0200
@@ -17,6 +17,7 @@
%define build_gtk3 (0%{suse_version} >= 1140)
+%define build_without_dbus_autolaunch (0%{suse_version} >= 1210)
Name: ibus
Version: 1.3.9
@@ -27,6 +28,7 @@
Source1: xim.d-ibus
Source2: ibus-README.suse
Source3: xim.ibus.suse.template
+Source4: xim.d-ibus-121
Patch0: ibus-python-install-dir.patch
#Patch1: ibus-disable-portability-check.patch
#Patch2: ibus-disable-introspect.patch
@@ -121,7 +123,11 @@
%install
%makeinstall
mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/
+%if %{build_without_dbus_autolaunch}
+install -m 644 $RPM_SOURCE_DIR/xim.d-ibus-121
$RPM_BUILD_ROOT/etc/X11/xim.d/ibus
+%else
install -m 644 $RPM_SOURCE_DIR/xim.d-ibus $RPM_BUILD_ROOT/etc/X11/xim.d/ibus
+%endif
sed -i 1i"SYS_LIB=%{_lib}" $RPM_BUILD_ROOT/etc/X11/xim.d/ibus
PRIORITY=40
++++++ xim.d-ibus-121 ++++++
OLD_PATH=$PATH
PATH=/usr/bin:/usr/X11R6/bin:/opt/kde3/bin:$PATH
if ! type -p ibus-daemon > /dev/null 2>&1 ; then
echo "ibus is not available."
PATH=$OLD_PATH
return 1
fi
#when skim installed, Autostart must be "false".
#here we move $HOME/.kde/share/config/skimrc to skimrc.orig.ibus
case "$WINDOWMANAGER" in
*kde*)
if type -p skim > /dev/null 2>&1 \
&& ! grep -i -q "^[[:space:]]*Autostart.*=.*false"
$HOME/.kde/share/config/skimrc
then
if [ -f $HOME/.kde/share/config/skimrc.orig.ibus ] ; then
mv -f $HOME/.kde/share/config/skimrc
$HOME/.kde/share/config/skimrc.orig.ibus
chmod 777 $HOME/.kde/share/config/skimrc.orig.ibus
fi
cat > $HOME/.kde/share/config/skimrc << __END
[General]
Autostart=false
__END
chmod 777 $HOME/.kde/share/config/skimrc
else
# do nothing
:
fi
;;
*)
# do nothing
;;
esac
# Determine the LC_CTYPE locale category setting
#tmplang=${LC_ALL-${LC_CTYPE-${LANG-en_US}}}
export LC_CTYPE=$LANG
export XMODIFIERS="@im=ibus"
export GTK_IM_MODULE=ibus
export QT_IM_SWITCHER=imsw-multi
if [ -e /usr/$SYS_LIB/qt4/plugins/inputmethods/libqtim-ibus.so ];
then
export QT_IM_MODULE=ibus
else
export QT_IM_MODULE=xim
fi
MACHINEID=`cat /var/lib/dbus/machine-id`
eval `dbus-launch --sh-syntax --autolaunch=$MACHINEID
--close-stderr`
ibus-daemon --xim -d
PATH=$OLD_PATH
# success:
return 0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
