[ibus/f16] Fixed Bug 786906 - Added ifnarch ppc ppc64 s390 s390x

Takao Fujiwara fujiwara at fedoraproject.org
Mon Mar 12 07:01:21 UTC 2012


commit 6c41f3e7a4cf1f7322f0cc9362215cc6fa5d23d9
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date:   Mon Mar 12 16:00:06 2012 +0900

    Fixed Bug 786906 - Added ifnarch ppc ppc64 s390 s390x

 ibus.spec |   10 ++++++++++
 sources   |    1 -
 2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/ibus.spec b/ibus.spec
index 079aee8..0acd358 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -3,7 +3,12 @@
 %{!?gtk3_binary_version: %define gtk3_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-3.0)}
 
 %define have_libxkbfile 1
+
+%ifarch ppc ppc64 s390 s390x
+%define have_gjsfile 0
+%else
 %define have_gjsfile 1
+%endif
 
 %if 0%{?fedora} > 16
 %define have_bridge_hotkey 1
@@ -160,6 +165,7 @@ Requires(post): glib2 >= %{glib_ver}
 %description gtk3
 This package contains ibus im module for gtk3
 
+%if %have_gjsfile
 %package gnome3
 Summary:    IBus gnome-shell-extension for GNOME3
 Group:      System Environment/Libraries
@@ -171,6 +177,7 @@ Requires:   gnome-shell
 This is a transitional package which allows users to try out new IBus
 GUI for GNOME3 in development.  Note that this package will be marked
 as obsolete once the integration has completed in the GNOME3 upstream.
+%endif
 
 %package devel
 Summary:    Development tools for ibus
@@ -204,6 +211,7 @@ cd $d
 cd ..
 %endif
 %endif
+
 %patch0 -p1
 %patch92 -p1 -b .g-s-preedit
 cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c
@@ -422,10 +430,12 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-ibus.so
 
+%if %have_gjsfile
 %files gnome3
 %defattr(-,root,root,-)
 %{_datadir}/gnome-shell/js/ui/status/ibus
 %{_datadir}/gnome-shell/extensions/ibus-indicator at example.com
+%endif
 
 %files devel
 %defattr(-,root,root,-)
diff --git a/sources b/sources
index 01586cd..6e01e73 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
 88ef7dda720cec2de92b8673832a702e  ibus-1.4.1.tar.gz
-675136bba0b04c922cca44eecd0bc421  ibus-1.4.99.20120203.tar.gz
 8c713e47d403482cdd8b851dda3d0713  ibus-gjs-3.3.3.20120203.tar.gz
 2d2ad58e3e41429dbd883ba7e501c9b2  ibus-gjs-3.2.1.20111230.tar.gz
 4257048de65ea404389bb941a51db667  ibus-gjs-3.0.2.20111118.tar.gz


More information about the scm-commits mailing list