merge from fedora 13

2010-05-08 00:03:33 +00:00 · 2010-05-08 00:03:33 +00:00 · cf678d71e2
commit cf678d71e2
parent 3f5c101aa0
3 changed files with 12 additions and 4 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1 @@
-ibus-1.3.2.tar.gz
+ibus-1.3.3.tar.gz
--- a/ibus.spec
+++ b/ibus.spec
@ -7,8 +7,8 @@
 %define im_chooser_version 1.2.5

 Name:       ibus
-Version:    1.3.2
-Release:    2%{?dist}
+Version:    1.3.3
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@ -218,8 +218,16 @@ fi
 %{_datadir}/gtk-doc/html/*

 %changelog
+* Tue May 04 2010 Peng Huang <shawn.p.huang@gmail.com> - 1.3.3-1
+- Update to 1.3.3
+
+* Sun May 02 2010 Peng Huang <shawn.p.huang@gmail.com> - 1.3.2-3
+- Embedded language bar in menu by default.
+- Fix bug 587353 - [abrt] crash in ibus-1.3.2-2.fc12
+
 * Sat Apr 24 2010 Peng Huang <shawn.p.huang@gmail.com> - 1.3.2-2
 - Add requires librsvg2
+- Update ibus-HEAD.patch: Update po files and and setting 

 * Wed Apr 21 2010 Peng Huang <shawn.p.huang@gmail.com> - 1.3.2-1
 - Update to 1.3.2
--- a/2
+++ b/2
@ -1 +1 @@
-0141f290a28a0d5e943cdedee5d28b67  ibus-1.3.2.tar.gz
+2be859019b593685b1cec8310627426f  ibus-1.3.3.tar.gz