[tycho] Make symlinked jars under %%{_javadir} unique.

[Roland Grunberg]

commit 456e39285970aa47c464943582db57a4d6099061
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Wed Oct 10 13:36:29 2012 -0400

    Make symlinked jars under %%{_javadir} unique.
    
    When a jar under %%{_javadir} is symlinked, it may clash with other jars
    of the same name (eg. multiple core.jar that are osgi bundles).
    
    This is also a non-bootstrap build.

 copy-platform-all |    5 ++++-
 tycho.spec        |    8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/copy-platform-all b/copy-platform-all
index 5cbd758..be875c7 100755
--- a/copy-platform-all
+++ b/copy-platform-all
@@ -76,11 +76,14 @@ for f in $(ls -d $eclipse/features/*); do
     [ ! -e features/$feature ] && ln -s $eclipse/features/$feature features/$feature
 done
 
+# jars in %%{_javadir} may not be uniquely named
+id=1
 for p in $(find /usr/share/java -name "*.jar"); do
     unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-SymbolicName'
     if [ $? = 0 ]; then
-        plugin=$(basename $p)
+        plugin=${id}-$(basename $p)
         [ ! -e plugins/$plugin ] && ln -s $p plugins/$plugin
+        id=$((${id} + 1))
     fi
 done
 
diff --git a/tycho.spec b/tycho.spec
index 5e3a5e0..fe3ff3b 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,4 +1,4 @@
-%global bootstrap 1
+%global bootstrap 0
 %global sha d7f8850f746dd72e0a97c1fdf32c06ce794fb83d
 
 %if %{bootstrap}
@@ -11,7 +11,7 @@
 
 Name:           tycho
 Version:        0.16.0
-Release:        10.d7f885%{?dist}
+Release:        11.d7f885%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 Group:          Development/Libraries
@@ -195,6 +195,10 @@ install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Oct 10 2012 Roland Grunberg <rgrunber at redhat.com> 0.16.0-11.d7f885
+- copy-platform-all should make symlinked jars from %%{_javadir} unique.
+- Non-bootstrap build (reset the %%bootstrap flag properly).
+
 * Mon Oct 8 2012 Krzysztof Daniel <kdaniel at redhat.com> 0.16.0-10.d7f885
 - Non-bootstrap build.