[rpms/ibus] autotool: Fixed Bug 720884 - gnome-shell freeze while terminating ibus

[Takao Fujiwara <tfujiwar@redhat.com>]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : c64cc4b26dc186aadaf2c366cf89dba21abefdd2
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2011-07-14T19:47:56+09:00
Stats  : +20/-24 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/c64cc4b26dc186aadaf2c366cf89dba21abefdd2?branch=autotool

Log:
Fixed Bug 720884 - gnome-shell freeze while terminating ibus

---
diff --git a/.gitignore b/.gitignore
index 2dcfdb9..5f02502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,8 +11,6 @@ ibus-1.3.6.tar.gz
 /ibus-1.3.99.20110228.tar.gz
 /ibus-1.3.99.20110408.tar.gz
 /ibus-1.3.99.20110419.tar.gz
-/gnome-shell-ibus-plugins-20110629.tar.bz2
-/ibus_master_da.po
-/ibus-indicator.tar.bz2
-/gnome-shell-ibus-plugins-20110630.tar.bz2
 /gnome-shell-ibus-plugins-20110708.tar.bz2
+/ibus_master_da.po
+/ibus-gjs-1.3.99.20110714.tar.gz

diff --git a/ibus.spec b/ibus.spec
index a901443..5cd2e5a 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -13,7 +13,7 @@
 
 Name:       ibus
 Version:    1.3.99.20110419
-Release:    10%{?dist}
+Release:    11%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -21,10 +21,9 @@ URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
 %if %have_gjsfile
-Source2:    http://fujiwara.fedorapeople.org/ibus/gnome-shell/gnome-shell-ibus-plugins-20110708.tar.bz2
+Source2:    http://fujiwara.fedorapeople.org/ibus/gnome-shell/ibus-gjs-1.3.99.20110714.tar.gz
 %endif
 Source3:    https://www.transifex.net/projects/p/ibus/resource/master/l/da/download/ibus_master_da.po
-Source4:    http://ueno.fedorapeople.org/ibus-indicator/ibus-indicator.tar.bz2
 Patch0:     ibus-HEAD.patch
 Patch1:     ibus-530711-preload-sys.patch
 Patch2:     ibus-xx-icon-symbol.patch
@@ -159,16 +158,7 @@ The ibus-devel-docs package contains developer documentation for ibus
 %prep
 %setup -q
 %if %have_gjsfile
-bzcat %SOURCE2 | tar xf -
-sed -i \
-  -e "s|Config.IBUS_XKB|'/usr/libexec/ibus-xkb'|" \
-  -e "s|Config.HAVE_IBUS_XKB|true|" \
-  js/ui/status/ibus/xkbLayout.js
-sed -i \
-  -e "s|imports.misc.config.IBUS_PREFIX|'/usr'|" \
-  -e "s|imports.misc.config.IBUS_PKGDATADIR|'/usr/share/ibus'|" \
-  js/ui/status/ibus/panel.js
-bzcat %SOURCE4 | tar xf -
+zcat %SOURCE2 | tar xf -
 %endif
 cp %SOURCE3 po/da.po
 %patch0 -p1
@@ -185,6 +175,14 @@ mv data/ibus.schemas.in data/ibus.schemas.in.in
 %patch91 -p1 -b .fallback-icon
 
 %build
+%if %have_gjsfile
+d=`basename %SOURCE2 .tar.gz`
+cd $d
+%configure
+make %{?_smp_mflags}
+cd ..
+%endif
+
 %if %have_libxkbfile
 aclocal -I m4
 autoheader
@@ -236,10 +234,11 @@ desktop-file-install --delete-original          \
 
 %if %have_gjsfile
 # https://bugzilla.redhat.com/show_bug.cgi?id=657165
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/gnome-shell
-cp -R js $RPM_BUILD_ROOT%{_datadir}/gnome-shell
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/gnome-shell/extensions
-cp -R ibus-indicator@example.com $RPM_BUILD_ROOT%{_datadir}/gnome-shell/extensions
+d=`basename %SOURCE2 .tar.gz`
+cd $d
+make DESTDIR=$RPM_BUILD_ROOT install
+rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/ibus-gjs.mo
+cd ..
 %endif
 
 # FIXME: no version number
@@ -354,7 +353,7 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Fri Jul 08 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110419-10
+* Fri Jul 08 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110419-11
 - Updated ibus-HEAD.patch for upstream.
 - Removed ibus-435880-surrounding-text.patch as upstream.
 - Added ibus-711632-fedora-fallback-icon.patch

diff --git a/sources b/sources
index a181bcc..6d64168 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 d4f2729fecb92ae6b41f26c770b1a772  ibus-1.3.99.20110419.tar.gz
-804084fb5245e39145d6d9114cdae568  gnome-shell-ibus-plugins-20110708.tar.bz2
+57df6a7d6a9ca0f4b30a8fe135fdcb89  ibus-gjs-1.3.99.20110714.tar.gz
 698c90edf0f037488e1aa969804e891f  ibus_master_da.po
-23756d25109745bdc1c3a54db370d210  ibus-indicator.tar.bz2