[eclipse-wtp-common] Don't use _libdir in noarch packages

[Gerard Ryan]

commit 6982e6f3f53b3d8015d4b1f635b0fca4b89e604e
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Fri Apr 19 22:49:07 2013 +0100

    Don't use _libdir in noarch packages

 eclipse-wtp-common.spec |   16 +++++++++++-----
 sources                 |    1 -
 2 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/eclipse-wtp-common.spec b/eclipse-wtp-common.spec
index 0c7dc2f..33136c4 100644
--- a/eclipse-wtp-common.spec
+++ b/eclipse-wtp-common.spec
@@ -1,9 +1,8 @@
 %global install_loc			%{_datadir}/eclipse/dropins
-%global eclipse_base		%{_libdir}/eclipse
 
 Name:			eclipse-wtp-common
 Version:		3.4.2
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Common infrastructure and utilities developed and used with WTP
 
 License:		EPL
@@ -47,9 +46,14 @@ find -name '*.class' -delete
 # Build useless jar that is needed to build but does nothing
 # See http://dev.eclipse.org/mhonarc/lists/wtp-dev/msg08607.html
 # and PERFMSR.README.txt in org.eclipse.perfmsr.core.stub/
+if [[ -e /usr/lib64/eclipse ]]; then
+	CORE_RUNTIME_JAR=`ls /usr/lib64/eclipse/plugins/org.eclipse.core.runtime_*`
+else
+	CORE_RUNTIME_JAR=`ls /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*`
+fi
+
 pushd R3_4_2/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src
-	ECLIPSE_CORE_RUNTIME=`ls %{eclipse_base}/plugins/org.eclipse.core.runtime_*`
-	javac -cp %{_javadir}/felix/org.osgi.core.jar:${ECLIPSE_CORE_RUNTIME} \
+	javac -cp %{_javadir}/felix/org.osgi.core.jar:${CORE_RUNTIME_JAR} \
 		org/eclipse/perfmsr/core/*.java
 	jar cf ../perfmsr.jar org/
 popd
@@ -105,13 +109,15 @@ unzip -q -o -d %{buildroot}%{install_loc}/%{name} \
 
 
 %changelog
+* Sun Apr 19 2013 Gerard Ryan <galileo at fedoraproject.org> - 3.4.2-2
+- Don't use _libdir in noarch packages
+
 * Sun Mar 17 2013 Gerard Ryan <galileo at fedoraproject.org> - 3.4.2-1
 - Update to upstream 3.4.2
 - Get sources from git.eclipse.org
 - Remove and rebuild perfmsr.jar
 - Run tests at end of build
 
-
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.0-4.20120711cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index d99e5ae..a2f23cb 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
 8c07efc5bee8993d9769e1f4353ec174  R3_4_2.tar.bz2
-4eee4e87fdc9ecb69dfaca5405b97f71  R3_4_0.tar.bz2
 9500100ae6d8b9dffb21c94fbf49ad0b  webtools.common.fproj-201208170133.tar.bz2
 1a94c75a99183b49a5e7f5d94c36f09e  webtools.common.tests-201208170133.tar.bz2
 459b61314dfd4b25614cd0a751d461b2  webtools.servertools-20130117_1051.tar.bz2