From d30270eba2f57ec860656f8cfdd51f5b701d02ec Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Wed, 4 Apr 2012 09:58:56 -0400
Subject: [PATCH] Define %%{_eclipse_base} to properly resolve %%{_libdir} for
 noarch.

---
 eclipse.spec   | 5 ++++-
 macros.eclipse | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclipse.spec b/eclipse.spec
index 6212829..4c64760 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -20,7 +20,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        0.4.fa15ab%{?dist}
+Release:        0.5.fa15ab%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -661,6 +661,9 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/dropins/sdk
 
 %changelog
+* Wed Apr 4 2012 Roland Grunberg <rgrunber@redhat.com> 1:4.2.0-0.5.fa15ab
+- Define %%{_eclipse_base} to properly resolve %%{_libdir} for noarch.
+
 * Mon Apr 2 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.4.fa15ab
 - pdebuild script installed into %{_bindir}
 
diff --git a/macros.eclipse b/macros.eclipse
index 22003fa..038b033 100644
--- a/macros.eclipse
+++ b/macros.eclipse
@@ -1,4 +1,7 @@
 # RPM macros for eclipse packages.
 #
 
-%_eclipse_base %{_libdir}/eclipse
+# There is no guarantee that %%{_libdir} will resolve properly on
+# noarch so we use this macro.
+%_eclipse_bits %(rpm --eval %{__isa_bits} | sed 's/32//')
+%_eclipse_base %{_prefix}/lib%{_eclipse_bits}/eclipse