From 7de04d1d88f270565613c6f93ec8fe9a178516fa Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Jan 25 2017 19:13:06 +0000
Subject: Fix bug in p2 Droplet detection of feature groups.


---

diff --git a/eclipse-adjust-droplets.patch b/eclipse-adjust-droplets.patch
index 9bb1e0a..bf88f61 100644
--- a/eclipse-adjust-droplets.patch
+++ b/eclipse-adjust-droplets.patch
@@ -50,3 +50,21 @@ index 12e4d89..77945ef 100644
  					// new magic - multiple info files, f.e.
  					//   egit.info (git feature)
  					//   cdt.link (properties file containing link=path) to other info file
+diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
+index 3d7e313..debbfb8 100644
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
+@@ -238,10 +238,11 @@ public class SurrogateProfileHandler implements ISurrogateProfileHandler {
+ 									|| "feature".equals(cap.getName())) { //$NON-NLS-1$
+ 								featureOrBundle = true;
+ 							}
+-						} else if (Boolean.TRUE.equals(unit.getProperties().get("org.eclipse.equinox.p2.type.group"))) { //$NON-NLS-1$
+-							featureOrBundle = true;
+ 						}
+ 					}
++					if (Boolean.TRUE.toString().equals(unit.getProperties().get("org.eclipse.equinox.p2.type.group"))) { //$NON-NLS-1$
++						featureOrBundle = true;
++					}
+ 					if (featureOrBundle && !added.contains(unit)) {
+ 						added.add(unit);
+ 						sharedProfile.addInstallableUnit(unit);
diff --git a/eclipse.spec b/eclipse.spec
index 6c599d1..3a1495c 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -47,7 +47,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.6.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        EPL
 URL:            http://www.eclipse.org/
 
@@ -1127,6 +1127,9 @@ fi
 %{_libdir}/eclipse/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Wed Jan 25 2017 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.2-6
+- Fix bug in p2 Droplet detection of feature groups.
+
 * Tue Jan 24 2017 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.2-5
 - Hide the p2 Droplets from cluttering Install Wizard Combo.
 - Resolves: rhbz#1413778