[ibus-xkbc] update to 1.3.3.20100922

[Peng Wu]

commit a156d5d9bf7a49d2a8b61ac9b418b5db28b4fa1a
Author: Peng Wu <alexepico at gmail.com>
Date:   Thu Mar 3 11:30:52 2011 +0800

    update to 1.3.3.20100922

 ibus-xkbc-fixes-autogen.patch        |   19 +++++++++++++++++++
 ibus-xkbc-fixes-python-version.patch |   25 +++++++++++++------------
 ibus-xkbc.spec                       |   12 ++++++++++--
 3 files changed, 42 insertions(+), 14 deletions(-)
---
diff --git a/ibus-xkbc-fixes-autogen.patch b/ibus-xkbc-fixes-autogen.patch
new file mode 100644
index 0000000..c35439f
--- /dev/null
+++ b/ibus-xkbc-fixes-autogen.patch
@@ -0,0 +1,19 @@
+Index: ibus-xkbc-1.3.3.20100922/autogen.sh
+===================================================================
+--- ibus-xkbc-1.3.3.20100922.orig/autogen.sh
++++ ibus-xkbc-1.3.3.20100922/autogen.sh
+@@ -2,12 +2,8 @@
+ set -e
+ set -x
+ 
+-if [[ "`uname -s`" = "SunOS" ]]
+-then
+-    glib-gettextize --force --copy || exit 1
+-else
+-    autopoint --force || exit 1
+-fi
++glib-gettextize --force --copy || exit 1
++
+ libtoolize --automake --copy --force
+ aclocal -I m4 --force
+ autoheader --force
diff --git a/ibus-xkbc-fixes-python-version.patch b/ibus-xkbc-fixes-python-version.patch
index 39a951d..b1ba60c 100644
--- a/ibus-xkbc-fixes-python-version.patch
+++ b/ibus-xkbc-fixes-python-version.patch
@@ -1,8 +1,8 @@
-Index: ibus-xkbc-1.3.3.20100804/engine/ibus-engine-xkbc.in
+Index: ibus-xkbc-1.3.3.20100922/engine/ibus-engine-xkbc.in
 ===================================================================
---- ibus-xkbc-1.3.3.20100804.orig/engine/ibus-engine-xkbc.in
-+++ ibus-xkbc-1.3.3.20100804/engine/ibus-engine-xkbc.in
-@@ -19,9 +19,9 @@
+--- ibus-xkbc-1.3.3.20100922.orig/engine/ibus-engine-xkbc.in
++++ ibus-xkbc-1.3.3.20100922/engine/ibus-engine-xkbc.in
+@@ -19,10 +19,10 @@
  # along with this program; if not, write to the Free Software
  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  #
@@ -12,25 +12,26 @@ Index: ibus-xkbc-1.3.3.20100804/engine/ibus-engine-xkbc.in
  export XKBC_SETUPDIR=@prefix@/share/ibus-xkbc/setup
  export XKBC_DATAFILE=@prefix@/share/ibus-xkbc/data/xkbc.dat
  export XKB_DATA_DIR=@prefix@/X11/share/X11/xkb
+ export XKBC_LOCALE_DIR=@prefix@/share/locale
 -exec python2.6 @prefix@/share/ibus-xkbc/engine/main.py $@
 +exec python2.7 @prefix@/share/ibus-xkbc/engine/main.py $@
-Index: ibus-xkbc-1.3.3.20100804/python-config.py
+Index: ibus-xkbc-1.3.3.20100922/python-config.py
 ===================================================================
---- ibus-xkbc-1.3.3.20100804.orig/python-config.py
-+++ ibus-xkbc-1.3.3.20100804/python-config.py
+--- ibus-xkbc-1.3.3.20100922.orig/python-config.py
++++ ibus-xkbc-1.3.3.20100922/python-config.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python2.6
 +#!/usr/bin/python2.7
  
  import sys
  import os
-Index: ibus-xkbc-1.3.3.20100804/setup/ibus-setup-xkbc.in
+Index: ibus-xkbc-1.3.3.20100922/setup/ibus-setup-xkbc.in
 ===================================================================
---- ibus-xkbc-1.3.3.20100804.orig/setup/ibus-setup-xkbc.in
-+++ ibus-xkbc-1.3.3.20100804/setup/ibus-setup-xkbc.in
-@@ -21,4 +21,4 @@
- export XKBC_LIBDIR=@prefix@/share/ibus-xkbc/setup/xkbc
+--- ibus-xkbc-1.3.3.20100922.orig/setup/ibus-setup-xkbc.in
++++ ibus-xkbc-1.3.3.20100922/setup/ibus-setup-xkbc.in
+@@ -22,4 +22,4 @@ export XKBC_LIBDIR=@prefix@/share/ibus-x
  export XKB_DATA_DIR=@prefix@/X11/share/X11/xkb
  export XKBC_DATAFILE=@prefix@/share/ibus-xkbc/data/xkbc.dat
+ export XKBC_LOCALE_DIR=@prefix@/share/locale
 -exec python2.6 @prefix@/share/ibus-xkbc/setup/main.py $@
 +exec python2.7 @prefix@/share/ibus-xkbc/setup/main.py $@
diff --git a/ibus-xkbc.spec b/ibus-xkbc.spec
index 7bb8928..d6a9589 100644
--- a/ibus-xkbc.spec
+++ b/ibus-xkbc.spec
@@ -1,14 +1,15 @@
 %define require_ibus_version 1.3.0
 
 Name:       ibus-xkbc
-Version:    1.3.3.20100804
-Release:    3%{?dist}
+Version:    1.3.3.20100922
+Release:    1%{?dist}
 Summary:    The XKBC engine for IBus input platform
 License:    GPLv2
 Group:      System Environment/Libraries
 URL:        http://github.com/sun-im/ibus-xkbc/
 Source0:    http://cloud.github.com/downloads/sun-im/ibus-xkbc/%{name}-%{version}.tar.gz
 Patch0:     ibus-xkbc-fixes-python-version.patch
+Patch1:     ibus-xkbc-fixes-autogen.patch
 
 BuildArch: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,6 +20,7 @@ BuildRequires:  python-devel
 BuildRequires:  pkgconfig
 BuildRequires:  rarian-compat
 BuildRequires:  gettext-autopoint
+BuildRequires:  glib2-devel
 
 Requires:   ibus >= %{require_ibus_version}
 
@@ -29,6 +31,7 @@ It provides keyboard layout emulation input method.
 %prep
 %setup -q
 %patch0 -p1 -b .python
+%patch1 -p1 -b .autogen
 
 %build
 sh autogen.sh
@@ -53,6 +56,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Thu Mar 03 2011  Peng Wu <pwu at redhat.com> - 1.3.3.20100922-1
+- Update to version 1.3.3.20100922
+  add patch ibus-xkbc-fixes-autogen.patch
+  add BuildRequires glib2-devel
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3.20100804-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild