[Fedora-i18n-bugs] [ibus-panel-extensions/f17: 5/5] Merge branch 'master' into f17

[Daiki Ueno]

commit 3b424bd90a97e5bc74f0692e19c50724fcfafc14
Merge: 629873a 1f6caa1
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Wed Apr 25 11:06:01 2012 +0900

    Merge branch 'master' into f17

 ibus-panel-extensions.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --cc ibus-panel-extensions.spec
index 0720503,daec36f..6f09ac4
--- a/ibus-panel-extensions.spec
+++ b/ibus-panel-extensions.spec
@@@ -55,12 -54,8 +55,11 @@@ Python language binding for %{name
  
  %prep
  %setup -q
- %patch0 -p1 -b .workaround-abi-break
  
  %build
 +# FIXME: workaround for gucharmap 3.3.1-1
 +GUCHARMAP_CFLAGS="`pkg-config gtk+-3.0 glib-2.0 --cflags` -I%{_includedir}/gucharmap-2.90"
 +export GUCHARMAP_CFLAGS
  %configure
  make %{?_smp_mflags}