[rpms/ibus] autotool: Rebase F-13

[rpms/ibus] autotool: Rebase F-13

[Peng Huang]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : 6611c094f1a3bd4a48c38d7968e6f68f589bf1aa
Author : Peng Huang <phuang@fedoraproject.org>
Date   : 2010-04-21T11:20:04+00:00
Stats  : +24/-6 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/6611c094f1a3bd4a48c38d7968e6f68f589bf1aa?branch=autotool

Log:
Rebase F-13

---
diff --git a/.cvsignore b/.cvsignore
index 5f61234..1698b59 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ibus-1.2.99.20100202.tar.gz
+ibus-1.3.2.tar.gz

diff --git a/ibus.spec b/ibus.spec
index 02b73ac..12c32db 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -7,7 +7,7 @@
 %define im_chooser_version 1.2.5
 
 Name:       ibus
-Version:    1.2.99.20100202
+Version:    1.3.2
 Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
@@ -32,6 +32,7 @@ BuildRequires:  gtk-doc
 BuildRequires:  GConf2-devel
 BuildRequires:  pygobject2-devel
 BuildRequires:  intltool
+BuildRequires:  iso-codes-devel
 
 Requires:   %{name}-libs = %{version}-%{release}
 Requires:   %{name}-gtk = %{version}-%{release}
@@ -107,7 +108,6 @@ The ibus-devel-docs package contains developer documentation for ibus
 
 %build
 %configure --disable-static \
-           --disable-iso-codes-check \
            --enable-gtk-doc
 # make -C po update-gmo
 make %{?_smp_mflags}
@@ -217,6 +217,24 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Apr 21 2010 Peng Huang <shawn.p.huang@gmail.com> - 1.3.2-1
+- Update to 1.3.2
+- Fix bug 583446 - [abrt] crash in ibus-1.3.1-1.fc12
+
+* Mon Apr 05 2010 Peng Huang <shawn.p.huang@gmail.com> - 1.3.1-1
+- Update to 1.3.1
+
+* Fri Mar 26 2010 Peng Huang <shawn.p.huang@gmail.com> - 1.3.0-3
+- Update ibus-HEAD.patch
+- Fix bug - some time panel does not show candidates.
+- Update some po files
+
+* Mon Mar 22 2010 Peng Huang <shawn.p.huang@gmail.com> - 1.3.0-2
+- Does not check glib micro version in ibus im module.
+
+* Mon Mar 22 2010 Peng Huang <shawn.p.huang@gmail.com> - 1.3.0-1
+- Update to 1.3.0
+
 * Tue Feb 02 2010 Peng Huang <shawn.p.huang@gmail.com> - 1.2.99.20100202-1
 - Update to 1.2.99.20100202
 

diff --git a/sources b/sources
index ef25d34..f43b912 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f383ef5f1e0454a258bca305974a9c83  ibus-1.2.99.20100202.tar.gz
+0141f290a28a0d5e943cdedee5d28b67  ibus-1.3.2.tar.gz

diff --git a/xinput-ibus b/xinput-ibus
index 937c54b..3eec7fd 100644
--- a/xinput-ibus
+++ b/xinput-ibus
@@ -1,7 +1,7 @@
 XIM=ibus
 XIM_PROGRAM="/usr/bin/ibus-daemon"
-ICON="/usr/share/icons/hicolor/scalable/apps/ibus.svg"
-XIM_ARGS="--xim -j 60"
+ICON="ibus"
+XIM_ARGS="--xim"
 PREFERENCE_PROGRAM=/usr/bin/ibus-setup
 SHORT_DESC="IBus"
 GTK_IM_MODULE=ibus