[ibus] Refined ifarch.
Takao Fujiwara
fujiwara at fedoraproject.org
Mon Mar 12 06:29:30 UTC 2012
commit 936f5059a596a793f0604c25a4ab77e9acc950f5
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date: Mon Mar 12 15:28:14 2012 +0900
Refined ifarch.
ibus.spec | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/ibus.spec b/ibus.spec
index f0ed5df..96562f9 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -3,13 +3,18 @@
%{!?gtk3_binary_version: %define gtk3_binary_version %(pkg-config --variable=gtk_binary_version gtk+-3.0)}
%define have_libxkbfile 1
-%define have_gjsfile 1
%define have_dconf 1
%define have_pygobject2 1
%define have_pygobject3 1
%define vala_build_failure 1
+%ifarch ppc ppc64 s390 s390x
+%define have_gjsfile 0
+%else
+%define have_gjsfile 1
+%endif
+
%if 0%{?fedora} > 16
%define ibus_gjs_version 3.3.90.20120308
%define ibus_gjs_build_failure 1
@@ -169,7 +174,7 @@ Requires(post): glib2 >= %{glib_ver}
%description gtk3
This package contains ibus im module for gtk3
-%ifnarch ppc ppc64 s390 s390x
+%if %have_gjsfile
%package gnome3
Summary: IBus gnome-shell-extension for GNOME3
Group: System Environment/Libraries
@@ -206,7 +211,6 @@ The ibus-devel-docs package contains developer documentation for ibus
%prep
%setup -q
-%ifnarch ppc ppc64 s390 s390x
%if %have_gjsfile
zcat %SOURCE2 | tar xf -
%if %ibus_gjs_build_failure
@@ -216,7 +220,6 @@ cd $d
cd ..
%endif
%endif
-%endif
%patch0 -p1
%patch92 -p1 -b .g-s-preedit
@@ -283,7 +286,6 @@ make %{?_smp_mflags} \
AM_DEFAULT_VERBOSITY=1 \
PKG_CONFIG_PATH=..:/usr/lib64/pkgconfig:/usr/lib/pkgconfig
-%ifnarch ppc ppc64 s390 s390x
%if %have_gjsfile
d=`basename %SOURCE2 .tar.gz`
cd $d
@@ -297,7 +299,6 @@ export PKG_CONFIG_PATH=..:/usr/lib64/pkgconfig:/usr/lib/pkgconfig
make %{?_smp_mflags}
cd ..
%endif
-%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -328,7 +329,6 @@ desktop-file-install --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/*
-%ifnarch ppc ppc64 s390 s390x
%if %have_gjsfile
# https://bugzilla.redhat.com/show_bug.cgi?id=657165
d=`basename %SOURCE2 .tar.gz`
@@ -337,7 +337,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/ibus-gjs.mo
cd ..
%endif
-%endif
# FIXME: no version number
%find_lang %{name}10
@@ -469,7 +468,7 @@ fi
%defattr(-,root,root,-)
%{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-ibus.so
-%ifnarch ppc ppc64 s390 s390x
+%if %have_gjsfile
%files gnome3
%defattr(-,root,root,-)
%{_datadir}/gnome-shell/js/ui/status/ibus
More information about the scm-commits
mailing list