From b673041e9e2a472b1f49e2330ce528df94aaafa6 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Aug 17 2009 20:14:52 +0000
Subject: - Remove unedded BRs at Andrew Overholt's recommendation

- Changed libdir to /usr/lib* at 'ajax' suggestion on irc to avoid noarch
    on 64-bit arches problem

---

diff --git a/aqute-bndlib.spec b/aqute-bndlib.spec
index 1cd3f99..5b6d9e9 100644
--- a/aqute-bndlib.spec
+++ b/aqute-bndlib.spec
@@ -28,13 +28,15 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%define _without_gcj_support 1
+
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define section   free
 
 Name:           aqute-bndlib
 Version:        0.0.203
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Epoch:          0
 Summary:        BND Library
 License:        ASL 2.0
@@ -62,8 +64,6 @@ BuildRequires:  java-devel >= 0:1.5.0
 BuildRequires:  ant >= 0:1.6.5
 #BuildRequires:  ecj
 BuildRequires:  eclipse-ecj
-BuildRequires:  eclipse-platform
-BuildRequires:  eclipse-rcp
 BuildRequires:  eclipse-jdt
 
 Requires:  java >= 0:1.5.0
@@ -103,18 +103,18 @@ mv OSGI-OPT/src src/main/java
 export LANG=en_US.utf8
 export OPT_JAR_LIST=:
 export CLASSPATH=$(build-classpath ant)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.osgi_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.osgi.services_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.jface_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.ui_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.jobs_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.runtime_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.resources_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.ui.workbench_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.equinox.common_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.equinox.registry_*.jar)
-CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.swt.*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.osgi_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.osgi.services_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.jface_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.jobs_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.runtime_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.resources_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.workbench_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.equinox.common_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.equinox.registry_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.swt.*.jar)
 
 %{javac} -d target/classes $(find src/main/java -type f -name "*.java")
 %{javadoc} -d target/site/apidocs -sourcepath src/main/java aQute.lib.header aQute.lib.osgi aQute.lib.qtokens aQute.lib.filter
@@ -187,6 +187,11 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed May 20 2009 Fernando Nasser <fnasser@redhat.com> 0.0.203-4.1
+- Remove unedded BRs at Andrew Overholt's recommendation
+- Changed libdir to /usr/lib* at 'ajax' suggestion on irc to avoid
+  noarch on 64-bit arches problem
+
 * Fri Mar 20 2009 Yong Yang <yyang@redhat.com> 0.0.203-4
 - rebuild with new maven2 2.0.8 built in bootstrap mode
 - merge from JPP-6