commit 14734e082d7f03cb67a12d27aaee7443c89e7bcf
Author: Daniel Mach <dmach(a)redhat.com>
Date: Wed Feb 1 17:12:08 2012 +0100
Tweak with_eclipse macro for rhel and non-intel architectures.
icu4j.spec | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/icu4j.spec b/icu4j.spec
index 62de7f0..92b9f3c 100644
--- a/icu4j.spec
+++ b/icu4j.spec
@@ -30,6 +30,12 @@
%global with_eclipse 1
+%if 0%{?rhel}
+%ifnarch %{ix86} x86_64
+%global with_eclipse 0
+%endif
+%endif
+
%global eclipse_base %{_libdir}/eclipse
# Note: this next section looks weird having an arch specified in a
# noarch specfile but the parts of the build
@@ -42,7 +48,7 @@
Name: icu4j
Version: 4.4.2.2
-Release: 9%{?dist}
+Release: 10%{?dist}
Epoch: 1
Summary: International Components for Unicode for Java
License: MIT and EPL
@@ -75,7 +81,11 @@ Requires: java >= 1:1.6.0
%if %{with_eclipse}
BuildRequires: eclipse-pde >= 0:3.2.1
%global debug_package %{nil}
-%else
+%endif
+
+# if we're building with eclipse or on rhel,
+# always do an arch build, noarch otherwise
+%if !%{with_eclipse} && !0%{?rhel:1}
BuildArch: noarch
%endif
@@ -187,6 +197,9 @@ cp %{name}-4.4.2.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%endif
%changelog
+* Wed Feb 1 2012 Daniel Mach <dmach(a)redhat.com> 1:4.4.2.2-10
+- Tweak with_eclipse macro for rhel and non-intel architectures.
+
* Fri Jan 27 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 1:4.4.2.2-9
- Getting back to 4 digit version