[tycho] Fix issues with bootstrap build.

[Roland Grunberg]

commit 1b30f95ae0327b38bf6e40731b5da9c534874fcb
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Mon Feb 24 13:09:02 2014 -0500

    Fix issues with bootstrap build.
    
    - Fix bug in bootstrap building of tycho-bundles-external.
    - Add BR to packages used by Eclipse bundles in bootstrap build.
    - Fix ecf bundles in bootstrap repo and add emf bundles.

 copy-platform-all  |   20 +++++---------------
 sources            |    2 +-
 tycho-bootstrap.sh |    2 +-
 tycho.spec         |   17 +++++++++++++----
 4 files changed, 20 insertions(+), 21 deletions(-)
---
diff --git a/copy-platform-all b/copy-platform-all
index f7a9e91..dd56786 100755
--- a/copy-platform-all
+++ b/copy-platform-all
@@ -1,14 +1,13 @@
 #! /bin/sh
 
-prefix=$ROOT_PREFIX
 sdk=$1'-sdk'
 repo=$1
 
-eclipse=$prefix$(rpm --eval '%{_libdir}')/eclipse
+eclipse=$(rpm --eval '%{_libdir}')/eclipse
 
-datadir=$prefix/usr/share/eclipse
-javadir=$prefix/usr/share/java
-jnidir=$prefix/usr/lib/java
+datadir=/usr/share/eclipse
+javadir=/usr/share/java
+jnidir=/usr/lib/java
 
 launcher="/usr/lib*/eclipse/plugins/org.eclipse.equinox.launcher_*.jar"
 if [ ! -e ${launcher} ]; then
@@ -87,16 +86,7 @@ done
 
 # jars in %%{_javadir} may not be uniquely named
 id=1
-for p in $(find $javadir -name "*.jar"); do
-    unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-SymbolicName'
-    if [ $? = 0 ]; then
-        plugin=${id}-$(basename $p)
-        [ ! -e plugins/$plugin ] && ln -s $p plugins/$plugin
-        id=$((${id} + 1))
-    fi
-done
-id=1
-for p in $(find $jnidir -name "*.jar"); do
+for p in $(find $javadir $jnidir -name "*.jar"); do
     unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-SymbolicName'
     if [ $? = 0 ]; then
         plugin=${id}-$(basename $p)
diff --git a/sources b/sources
index e994656..b6fc3ea 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 012fd267fc85a6b3372acac6e4860e76  tycho-0.19.x.tar.bz2
-cdfdcca143b34dab6688533a8c0eef04  eclipse-bootstrap.tar.xz
+a99482415dbbf43ff2f00e29b793c004  eclipse-bootstrap.tar.xz
diff --git a/tycho-bootstrap.sh b/tycho-bootstrap.sh
index 20e1f85..e689b0b 100755
--- a/tycho-bootstrap.sh
+++ b/tycho-bootstrap.sh
@@ -202,7 +202,7 @@ done
 # Tycho Bundles External (needed for Tycho's OSGi Runtime)
 tbeDir='tycho-bundles/tycho-bundles-external'
 tbeTargetDir="${tbeDir}/target"
-wantedBundles=`sed -n 's/.*<plugin id=\"\(.*\)\"\/>.*/\1/ p' "${tbeDir}/tycho-bundles-external.product"`
+wantedBundles=`sed 's/ fragment=\"true\"//' "${tbeDir}/tycho-bundles-external.product" | sed -n 's/.*<plugin id=\"\(.*\)\"\/>.*/\1/ p'`
 
 mkdir -p ${tbeTargetDir}'/eclipse/plugins'
 copyBundles "${wantedBundles}" "${tbeTargetDir}/eclipse/plugins"
diff --git a/tycho.spec b/tycho.spec
index 71e2cf9..248412a 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -19,7 +19,7 @@
 
 Name:           tycho
 Version:        0.19.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 Group:          Development/Libraries
@@ -75,7 +75,13 @@ BuildRequires:  maven-plugin-testing-harness
 %if ! %{tycho_bootstrap}
 BuildRequires:  %{name}
 %endif
-%if ! %{eclipse_bootstrap}
+%if %{eclipse_bootstrap}
+# Dependencies for Eclipse bundles we use
+BuildRequires:  icu4j-eclipse
+BuildRequires:  geronimo-annotation
+BuildRequires:  sac
+BuildRequires:  sat4j
+%else
 BuildRequires:  eclipse-platform
 %endif
 BuildRequires:  jetty-http
@@ -202,8 +208,10 @@ cp %{SOURCE3} ./
 %if %{eclipse_bootstrap}
 # Create the Target Platform for the final build
 mkdir -p .m2/p2/repo-sdk/plugins
-for p in $(pwd)/bootstrap/usr/lib*/eclipse/plugins/*; do
-  ln -s -t .m2/p2/repo-sdk/plugins $p
+for pdir in `find $(pwd)/bootstrap/ -type d -name plugins`; do
+  for p in $pdir/* ; do
+    ln -s -t .m2/p2/repo-sdk/plugins $p
+  done
 done
 %endif
 
@@ -328,6 +336,7 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
 %changelog
 * Wed Jan 15 2014 Roland Grunberg <rgrunber at redhat.com> - 0.19.0-8
 - Perform a pure bootstrap build.
+- Fix issues with bootstrap build.
 
 * Thu Jan 09 2014 Roland Grunberg <rgrunber at redhat.com> - 0.19.0-7
 - Fix bootstrap build.