From 331baf8b89424a1def8e330d07b2e1d81e065b93 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Aug 03 2016 19:27:23 +0000
Subject: Add missing droplets logic to the EngineActivator.


- Restore 'p2.runnable' property for droplets.

---

diff --git a/eclipse-adjust-droplets.patch b/eclipse-adjust-droplets.patch
index e22e4a5..9bb1e0a 100644
--- a/eclipse-adjust-droplets.patch
+++ b/eclipse-adjust-droplets.patch
@@ -1,3 +1,29 @@
+diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
+index 5fc0e73..ed7e4fa 100644
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
+@@ -144,7 +144,20 @@ public class EngineActivator implements BundleActivator {
+ 						}
+ 						continue;
+ 					}
+-					File[] listFiles = extension.listFiles();
++
++					// Support the additional 'eclipse' directory if it exists.
++					File[] extensionFiles = extension.listFiles(new FilenameFilter() {
++						public boolean accept(File dir, String name) {
++							return name.equals("eclipse");
++						}
++					});
++
++					File[] listFiles;
++					if (extensionFiles.length == 1) {
++						listFiles = extensionFiles[0].listFiles();
++					} else {
++						listFiles = extension.listFiles();
++					}
+ 					// 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.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
 index 12e4d89..77945ef 100644
 --- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
diff --git a/eclipse-make-droplets-runnable.patch b/eclipse-make-droplets-runnable.patch
new file mode 100644
index 0000000..92d98fd
--- /dev/null
+++ b/eclipse-make-droplets-runnable.patch
@@ -0,0 +1,62 @@
+From a589a11f30a72976a418c27c041761dfc6ed3695 Mon Sep 17 00:00:00 2001
+From: Roland Grunberg <rgrunber@redhat.com>
+Date: Wed, 3 Aug 2016 14:57:10 -0400
+Subject: [PATCH] p2 Droplets should be recognized as runnable repositories.
+
+Normally, a runnable repository is identified by the 'p2.runnable'
+property contained within the artifact repository (artifact.xml).
+However, in Fedora we ship p2 Droplets without this file so we need a
+way to let methods like getRunnableRepositories in
+o.e.equinox.internal.p2.touchpoint.eclipse.Util know that p2 Droplets
+are runnable repositories.
+
+Change-Id: I0ad0a7557f998b4d032466f89e6cc76036d1fb38
+---
+ .../ExtensionLocationArtifactRepository.java       | 31 ++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
+
+diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
+index 342e33e..7e1c5b2 100644
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
+@@ -260,6 +260,37 @@ public class ExtensionLocationArtifactRepository extends AbstractRepository<IArt
+ 		return artifactRepository.getProperties();
+ 	}
+ 
++	public String getProperty(String key) {
++		if (key.equals(IArtifactRepository.PROP_RUNNABLE)
++				&& getLocation().getScheme().equals("file")
++				&& getLocation().getPath().contains("droplets")) {
++			File extension = new File(getLocation());
++			if (extension.exists()) {
++				// Support the additional 'eclipse' directory if it exists.
++				File[] extensionFiles = extension.listFiles(new FilenameFilter() {
++					public boolean accept(File dir, String name) {
++						return name.equals("eclipse");
++					}
++				});
++
++				File[] listFiles;
++				if (extensionFiles.length == 1) {
++					listFiles = extensionFiles[0].listFiles();
++				} else {
++					listFiles = extension.listFiles();
++				}
++
++				for (File file : listFiles) {
++					if (file.getName().endsWith(".info")) { //$NON-NLS-1$
++						return Boolean.TRUE.toString();
++					}
++				}
++			}
++
++		}
++		return super.getProperty(key);
++	}
++
+ 	public String setProperty(String key, String value, IProgressMonitor monitor) {
+ 		try {
+ 			ensureInitialized();
+-- 
+2.7.4
+
diff --git a/eclipse.spec b/eclipse.spec
index c93ef1c..624cd23 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -49,7 +49,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        EPL
 URL:            http://www.eclipse.org/
 
@@ -125,6 +125,7 @@ Patch23: eclipse-webkit2-by-default.patch
 # Port to jetty 9.4
 Patch24: eclipse-jetty-9.4.patch
 Patch25: eclipse-popupdialog-color.patch
+Patch26: eclipse-make-droplets-runnable.patch
 
 BuildRequires: tycho >= 0.25.0
 BuildRequires: tycho-extras >= 0.25.0
@@ -375,6 +376,7 @@ tar --strip-components=1 -xf %{SOURCE1}
 %patch24
 %endif
 %patch25
+%patch26
 
 # Resolving the target platform requires too many changes, so don't use it
 %pom_xpath_remove "pom:configuration/pom:target" eclipse-platform-parent
@@ -1096,6 +1098,10 @@ fi
 %{_libdir}/eclipse/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Wed Aug 03 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.0-4
+- Add missing droplets logic to the EngineActivator.
+- Restore 'p2.runnable' property for droplets.
+
 * Wed Jul 13 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.0-3
 - Update eclipse-pde-tp-support-droplets.patch to handle source bundles.
 - Change PopupDialog from SWT.COLOR_INFO* to SWT.COLOR_LIST*.