[tycho] Detect OSGi jars using presence of the Bundle-SymbolicName entry.

[Roland Grunberg]

commit 4fc2026190a6ff5c755cba3c1e9b5ab2895adb08
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Mon Jul 23 12:54:02 2012 -0400

    Detect OSGi jars using presence of the Bundle-SymbolicName entry.

 copy-platform-all               |    2 +-
 tycho-use-custom-resolver.patch |    3 ++-
 tycho.spec                      |    5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/copy-platform-all b/copy-platform-all
index 0adfd14..8a44193 100755
--- a/copy-platform-all
+++ b/copy-platform-all
@@ -77,7 +77,7 @@ for f in $(ls -d $eclipse/features/*); do
 done
 
 for p in $(find /usr/share/java -name "*.jar"); do
-    unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-ManifestVersion'
+    unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-SymbolicName'
     if [ $? = 0 ]; then
         plugin=$(basename $p)
         [ ! -e plugins/$plugin ] && ln -s $p plugins/$plugin
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index db8b4b3..c1adedc 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -80,7 +80,7 @@ index 80810d6..24efc87 100644
  import java.util.List;
  
  import org.apache.maven.AbstractMavenLifecycleParticipant;
-@@ -51,6 +52,20 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
+@@ -51,6 +52,21 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
          registerExecutionListener(session);
          configureComponents(session);
  
@@ -89,6 +89,7 @@ index 80810d6..24efc87 100644
 +            try {
 +                String[] cmd = new String[] { "/usr/share/java/tycho/copy-platform-all",
 +                        System.getProperty("user.dir") + "/.m2/p2/repo" };
++                System.out.println("Building system local p2 repository...");
 +                Process p = Runtime.getRuntime().exec(cmd);
 +                p.waitFor();
 +            } catch (IOException e) {
diff --git a/tycho.spec b/tycho.spec
index 7b5f46f..3c2c9c8 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,4 +1,4 @@
-%global bootstrap 0
+%global bootstrap 1
 
 %if %{bootstrap}
 %global snap -SNAPSHOT
@@ -199,6 +199,9 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jul 23 2012 Roland Grunberg <rgrunber at redhat.com> 0.14.1-6
+- Detect OSGi jars using presence of Bundle-SymbolicName entry (BZ #838513).
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild