Accepting request 73463 from home:swyear:branches:M17N

- Update to ibus 1.3.9
- Set priority to 40, if we want to use ibus as default input method,
  better use a lower priority, so if any other input method framework
  installed, system can use other input method instead.
- Update README
- Remove kimpanel script from start up script
- Add gtk3 immodule

OBS-URL: https://build.opensuse.org/request/show/73463
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=14

ibus-1.3.8.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d8507517f5e5ba454b2663581b1133df21fdba74a077902259e18845cdd2468d
-size 1379038

ibus-1.3.9.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b2784a668666efa8ae04e6f1cff5749917cd18add0a39a1d020ecc9f3df5285d
+size 1380081

ibus-README.suse

@@ -1,60 +1,70 @@
 ibus README for SuSE
 How to start using ibus
 
-In poor English:
+English:
+
 0:Note: ibus don't support QT3 immodule,
 If you use qt3-base applications, modify your /etc/X11/xim.d/ibus to
 export QT_IM_MODULE=xim
 
-1.SuSE can start ibus automatically when your locale is set to en, zh_TW, zh_CN, zh_HK, zh_SG, ko_KR and ja_JP.
+1.openSUSE can start ibus automatically when your locale is set to en, zh_TW, zh_CN, zh_HK, zh_SG, ko_KR and ja_JP.
-The setup script is a link in /etc/X11/xim.d/YOUR-LOCALE/15-ibus which link to /etc/X11/xim.d/ibus. 
+The setup script is a link in /etc/X11/xim.d/YOUR-LOCALE/40-ibus which link to /etc/X11/xim.d/ibus. 
-The number "15" makes ibus have priority over other input-method (e.g 50-scim or 90-xcin ).
+The number "40" makes ibus have priority over other input-method (e.g 50-scim or 90-xcin ).
-If you prefer not using ibus, mv 15-ibus to 80-ibus (for example). Or see 2.
+If you prefer not using ibus, mv 40-ibus to 80-ibus (for example). Or see 2.
 
 2.If for some reason can't start ibus when login Xwindow
-(1)maybe you are using root to login X,
+There is another input-method who has higher priority then ibus (e.g 10-oxim)
-(2)your /etc/X11/xim was modified,
-(3)you are using a locale other than 1.
-(4)there is another input-method who has higher priority then ibus (e.g 10-oxim)
 You can edit ~/.xim, see ~/.xim.template for more informations.
 Or edit ~/.profile, add
 export INPUT_METHOD="ibus"
 After installing ibus, there's a template for ibus: /usr/share/doc/packages/ibus/xim.ibus.suse.template
 copy this file to ~/.xim, then you can use ibus next login X.
 
-3.You want to use your own input-method other than system setting, see 2.
+3.You want to use your own input-method other than system setting
+(1)System setting:
+Edit /etc/sysconfig/language , set INPUT_METHOD="scim-bridge", or whatever you want,Make sure your start-up script is put in /etc/X11/xim.d/ with same name ypu mention.
+(2)For specific language setting:
+Link a start-up script in /etc/X11/xim.d/ to your locale with a higher priority (smaller number), eg
+ln -s /etc/X11/xim.d/scim-bridge /etc/X11/xim.d/zh_TW/20-scim-bridge
+(3)Personal setting:
+Edit ~/.profile add
+export INPUT_METHOD="scim-bridge" or whatever script in /etc/X11/xim.d/
+or white your own ~/.xim, see ~/.xim.template for more informations.
 
-4.Notice:ibus will try to stop skim(a front-end of scim in kde) auto-start when login kde.
+4.Bug report or any suggestion to
-
-5.Bug report or any suggestion to
 http://code.google.com/p/ibus/
 
 
-In Chinese:
+Chinese:
+
 0:注意：ibus 不支援 QT3 immodule,
 若您使用 qt3-based 應用程式，請修改 /etc/X11/xim.d/ibus 設定
 export QT_IM_MODULE=xim
 
 1.當您使用的語系是en 或zh_*時，SuSE 會自動啟動ibus
-啟動的script是/etc/X11/xim.d/YOUR-LOCALE/15-ibus，這是一個到上層目錄ibus的連結
+啟動的script是/etc/X11/xim.d/YOUR-LOCALE/40-ibus，這是一個到上層目錄ibus的連結
-"15"這個數字使他的優先順序高於90-xcin及50-scim
+"40"這個數字使他的優先順序高於90-xcin及50-scim
 如果您不喜歡這個順序，修改連結的名稱為(例如：80-ibus)，或參考2.
 
 2.重新登入X後，如果不能用ibus...可能是：
-(1)您用root登入X，
+有別的輸入法的優先順序高於ibus(例如：10-oxim)
-(2)您的/etc/X11/xim被更改過了，
-或普通使用者無法想使用自己的設定，
-(3)您使用非1.中指定的語系
-(4)有別的輸入法的優先順序高於ibus(例如：10-oxim)
 您可以編輯~/.xim，請參考~/.xim.template
 安裝ibus後，會有一個範本：/usr/share/doc/packages/ibus/xim.ibus.suse.template
 將這個檔案複製到您的~/.xim，當您下次登入X時就可以使用ibus了
 或編輯~/.profile，加入
 export INPUT_METHOD="ibus"
 
-3.如果您想要自己選擇輸入法而非使用系統設定，請參考2.
+3.如果您想要自己選擇輸入法而非使用系統設定
-
+(1)全系統設定：
-4.注意：ibus會取消skim(scim的kde前端程式)的auto-start
+編輯 /etc/sysconfig/language, 設定 INPUT_METHOD="ibus" 或其他你想用的輸入法，
+請注意你的啟動程序必須位於 /etc/X11/xim.d/，並和您指定的名稱相同
+(2)針對特定語言：
+將您的啟動程序連結到你的語系中，並前置較高的優先順序(較小數字)，例如
+ln -s /etc/X11/xim.d/ibus /etc/X11/xim.d/zh_TW/20-ibus
+(3)個人設定：
+編輯 ~/.profile 加入
+export INPUT_METHOD="ibus" 或其他在 /etc/X11/xim.d/ 的啟動程序
+或自行編寫啟動程序 ~/.xim，請參考 ~/.xim.template
 
 5.臭蟲回報或建議請至
 http://code.google.com/p/ibus/

ibus.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jun 13 16:15:29 UTC 2011 - swyear@gmail.com
+
+- Update to ibus 1.3.9
+- Set priority to 40, if we want to use ibus as default input method,
+  better use a lower priority, so if any other input method framework
+  installed, system can use other input method instead.
+- Update README
+- Remove kimpanel script from start up script
+- Add gtk3 immodule 
+
 -------------------------------------------------------------------
 Wed Mar  9 11:58:08 CET 2011 - tiwai@suse.de
 

ibus.spec

@@ -18,8 +18,8 @@
 
 
 Name:           ibus
-Version:        1.3.8
+Version:        1.3.9
-Release:        6
+Release:        1
 License:        LGPL V2+
 Url:            http://code.google.com/p/ibus/
 Source0:        http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
@@ -27,8 +27,8 @@ Source1:        xim.d-ibus
 Source2:        ibus-README.suse  
 Source3:        xim.ibus.suse.template 
 Patch0:         ibus-python-install-dir.patch
-Patch1:         ibus-disable-portability-check.patch
+#Patch1:         ibus-disable-portability-check.patch
-Patch2:         ibus-disable-introspect.patch
+#Patch2:         ibus-disable-introspect.patch
 Group:          System/I18n/Chinese
 Summary:        Intelligent Input Bus for Linux OS
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -40,10 +40,7 @@ BuildRequires:  gettext-devel gtk-doc libtool python
 BuildRequires:  dbus-1-devel dbus-1-glib-devel dbus-1-python-devel gtk2-devel
 BuildRequires:  gconf2-devel python-gobject2-devel update-desktop-files
 BuildRequires:  fdupes gobject-introspection-devel intltool iso-codes-devel
-%if %suse_version >= 1100
+Requires:       python-gtk dbus-1-python notification-daemon iso-codes gconf2 python-xdg python-notify gobject-introspection
-BuildRequires:  pcre-devel
-%endif
-Requires:       glib2 python-gtk dbus-1-python notification-daemon iso-codes gconf2 python-xdg python-notify gobject-introspection
 %gconf_schemas_prereq
 
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
@@ -57,7 +54,7 @@ developers to develop input method easily.
 %package -n libibus2
 License:        LGPL V2+
 Summary:        IBus libraries
-Group:          System Environment/Libraries
+Group:          System/I18n/Chinese
 
 %description -n libibus2
 This package contains the libraries for IBus
@@ -65,17 +62,30 @@ This package contains the libraries for IBus
 %package gtk
 License:        LGPL V2+
 Summary:        IBus im module for gtk2
-Group:          System Environment/Libraries
+Group:          System/I18n/Chinese
 Requires:       %{name} = %{version}-%{release}
 %gtk2_immodule_requires
-
+%if %suse_version >= 1140
+%gtk3_immodule_requires
+%endif
 %description gtk
 This package contains ibus im module for gtk2
 
+%if %suse_version >= 1140
+%package gtk3
+Summary:    IBus im module for gtk3
+Group:      System/I18n/Chinese
+Requires:   %{name} = %{version}-%{release}
+BuildRequires: gtk3-devel
+ 
+%description gtk3
+This package contains ibus im module for gtk3
+%endif
+
 %package devel
 License:        LGPL V2+
 Summary:        Development tools for ibus
-Group:          Development/Libraries
+Group:          Development/Libraries/other
 Requires:       libibus2 = %{version}-%{release}
 Requires:       glib2-devel
 Requires:       dbus-1-devel
@@ -89,18 +99,26 @@ docs for ibus.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 
 %build
 autoreconf -fi
 intltoolize -f
+%if %suse_version >= 1140
+%configure --disable-static \
+		   --disable-iso-codes-check \
+                   --disable-gobject-introspection \
+		   --enable-gtk-doc \
+	           --libexecdir=%{_prefix}/%{_lib}/ibus \
+		--enable-gtk3
+%else
 %configure --disable-static \
                    --disable-iso-codes-check \
                    --disable-gobject-introspection \
                    --enable-gtk-doc \
-		   --disable-qt4-immodule \
                    --libexecdir=%{_prefix}/%{_lib}/ibus
+%endif
 make %{?jobs:-j %jobs}
 
 %install
@@ -113,7 +131,7 @@ sed -i 1i"SYS_LIB=%{_lib}" $RPM_BUILD_ROOT/etc/X11/xim.d/ibus
      for lang in en zh_TW zh_HK zh_CN zh_SG ko_KR ja_JP ; do  
          mkdir $lang  
      pushd $lang  
-             ln -s ../ibus 10-ibus  
+             ln -s ../ibus 40-ibus  
      popd  
      done  
  popd
@@ -153,13 +171,21 @@ rm -rf %buildroot
 
 %postun -n libibus2 -p /sbin/ldconfig
 
+%if %suse_version >= 1140
+%post gtk3
+%gtk3_immodule_post
+ 
+%postun gtk3
+%gtk3_immodule_postun
+%endif
+
 %files -f %{name}.lst
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %doc $RPM_SOURCE_DIR/xim.ibus.suse.template  
 %doc $RPM_SOURCE_DIR/ibus-README.suse
 %dir /etc/X11/xim.d
-/etc/X11/xim.d/* 
+%config /etc/X11/xim.d/* 
 %{python_sitelib}/ibus
 %dir %{_datadir}/ibus/
 %{_bindir}/ibus-daemon
@@ -171,6 +197,8 @@ rm -rf %buildroot
 %{_prefix}/%{_lib}/ibus
 %dir %{_datadir}/vala
 %{_datadir}/vala/*
+%{_libdir}/girepository-1.0/IBus-1.0.typelib
+%{_datadir}/gir-1.0/IBus-1.0.gir
 
 %files -n libibus2
 %defattr(-,root,root,-)
@@ -180,6 +208,12 @@ rm -rf %buildroot
 %defattr(-,root,root,-)
 %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so
 
+%if %suse_version >= 1140
+%files gtk3
+%defattr(-,root,root,-)
+%{_libdir}/gtk-3.0/3.0.0/immodules/*
+%endif
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so

xim.d-ibus

@@ -45,24 +45,7 @@ esac
             else
                     export QT_IM_MODULE=xim
             fi
-## test if use kimpanel
-## make sure your ibus panel for kimpanel is /usr/libexec/panel.py
-## or you can specify it below
-#export KIMPANEL_IBUS=/usr/libexec/panel.py
-## but there's some problems to startup ibus-panel for kimpanel
-## use ~/.kde4/Autostart/kimpanel-ibus instead
-            if [ -e /usr/libexec/panel.py ]; then
-#                    ibus-daemon --panel=$KIMPANEL_IBUS --xim -d
-                     if [ ! -e ~/.kde4/Autostart/kimpanel-ibus ]; then
-                         cp /usr/$SYS_LIB/ibus/dbus/kimpanel-ibus \
-                         ~/.kde4/Autostart/kimpanel-ibus
-                     fi
-            else
-                     if [ -e ~/.kde4/Autostart/kimpanel-ibus ]; then
-                         rm ~/.kde4/Autostart/kimpanel-ibus
-                     fi
             ibus-daemon --xim -d
-            fi
 
 PATH=$OLD_PATH