Hello community,

here is the log from the commit of package scim-bridge for openSUSE:Factory 
checked in at 2011-11-28 12:57:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scim-bridge (Old)
 and      /work/SRC/openSUSE:Factory/.scim-bridge.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "scim-bridge", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:Factory/scim-bridge/scim-bridge.changes  2011-10-29 
08:01:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.scim-bridge.new/scim-bridge.changes     
2011-11-28 12:57:16.000000000 +0100
@@ -1,0 +2,19 @@
+Sun Nov 27 06:50:23 UTC 2011 - [email protected]
+
+- add libtool as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
+Wed Nov 16 12:11:50 UTC 2011 - [email protected]
+
+- Add etc-x11-xim.d-scim-bridge-114 to use GTK_IM_MODULE="scim"
+  cause 11.4 don't support fallback mode
+- For 11.2 and newer version, set GTK_IM_MODULE="scim-bridge:scim:xim" 
+  so gtk3-base application can use scim's gtk3 immodule
+
+-------------------------------------------------------------------
+Tue Nov 15 15:43:54 UTC 2011 - [email protected]
+
+- scim-bridge don't support gtk3 immodule
+  use GTK_IM_MODULE="scim" 
+
+-------------------------------------------------------------------

New:
----
  etc-x11-xim.d-scim-bridge-114

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

Other differences:
------------------
++++++ scim-bridge.spec ++++++
--- /var/tmp/diff_new_pack.r02nX1/_old  2011-11-28 12:57:22.000000000 +0100
+++ /var/tmp/diff_new_pack.r02nX1/_new  2011-11-28 12:57:22.000000000 +0100
@@ -20,12 +20,12 @@
 
 Name:           scim-bridge
 BuildRequires:  docbook-xsl-stylesheets doxygen gtk2-devel libqt4-devel 
qt3-devel scim-devel
+BuildRequires:  libtool
 Summary:        Scim Bridge
 Version:        0.4.16
-Release:        128
+Release:        0
 License:        LGPLv2.1+
 Group:          System/I18n/Japanese
-AutoReqProv:    on
 PreReq:         /usr/bin/touch
 Provides:       locale(scim:ja;ko;zh)
 Recommends:     scim-bridge-gtk,scim-bridge-qt
@@ -36,6 +36,7 @@
 Source0:        scim-bridge-%{version}.tar.bz2
 Source1:        baselibs.conf
 Source10:       etc-x11-xim.d-scim-bridge
+Source11:       etc-x11-xim.d-scim-bridge-114
 Patch3:         bug-351920-should-return-retval.patch
 Patch8:         scim-bridge-0.4.15-gcc44.patch
 Patch10:        scim-bridge-reregister-type-module-if-reload.patch
@@ -135,8 +136,13 @@
 popd
 rm -f $RPM_BUILD_ROOT/%qt4_plugindir/inputmethods/im-scim-bridge.*a
 mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/
+%if %suse_version < 1210
+install -m 644 $RPM_SOURCE_DIR/etc-x11-xim.d-scim-bridge-114 \
+               $RPM_BUILD_ROOT/etc/X11/xim.d/scim-bridge
+%else
 install -m 644 $RPM_SOURCE_DIR/etc-x11-xim.d-scim-bridge \
                $RPM_BUILD_ROOT/etc/X11/xim.d/scim-bridge
+%endif
 # install symlinks in /etc/X11/xim.d/$lang for all languages
 # where scim-bridge might be useful:
 PRIORITY=49

++++++ etc-x11-xim.d-scim-bridge ++++++
--- /var/tmp/diff_new_pack.r02nX1/_old  2011-11-28 12:57:22.000000000 +0100
+++ /var/tmp/diff_new_pack.r02nX1/_new  2011-11-28 12:57:22.000000000 +0100
@@ -7,7 +7,7 @@
 fi
 
 export XMODIFIERS=@im=SCIM
-export GTK_IM_MODULE="scim-bridge:xim"
+export GTK_IM_MODULE="scim-bridge:scim:xim"
 export QT_IM_SWITCHER=imsw-multi
 export QT_IM_MODULE=scim-bridge
 case "$WINDOWMANAGER" in

++++++ etc-x11-xim.d-scim-bridge-114 ++++++
OLD_PATH=$PATH
PATH=/usr/bin:/opt/kde3/bin:$PATH

if ! type -p scim > /dev/null 2>&1 ; then
    echo "scim is not available."
    return 1
fi

export XMODIFIERS=@im=SCIM
export GTK_IM_MODULE="scim"
export QT_IM_SWITCHER=imsw-multi
export QT_IM_MODULE=scim-bridge
case "$WINDOWMANAGER" in
    /opt/kde3/bin/startkde)
        if ! type -p skim > /dev/null 2>&1 \
          || grep -i -q "^[[:space:]]*Autostart.*=.*false" 
$HOME/.kde/share/config/skimrc
        then
            scim -d
        else
        # skim will be  used. But we don't start it here,
        # we rely on the KDE3 autostart
        # mechanism used in the skim package instead.
        # skim -d
        :
        fi
    ;;
    *)
        scim -d          
    ;;
esac

PATH=$OLD_PATH

# success:
return 0
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to