From 1acbc6e73b5ef0d92c8f99c44c049aa4d8d6a669 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Sep 21 2015 20:52:34 +0000
Subject: Fix missing test resources


- Fix missing exit code in console

---

diff --git a/eclipse-cdt-exit-code.patch b/eclipse-cdt-exit-code.patch
new file mode 100644
index 0000000..a1e7d05
--- /dev/null
+++ b/eclipse-cdt-exit-code.patch
@@ -0,0 +1,26 @@
+From ddf192339270ae4bdd8990d4df48689140ac08a1 Mon Sep 17 00:00:00 2001
+From: Marc Khouzam <marc.khouzam@ericsson.com>
+Date: Thu, 17 Sep 2015 10:39:44 -0400
+Subject: [PATCH] Bug 477728 - Exit code not displayed in console for new Run config
+
+Change-Id: Id1ecdffb5d3a99908f7ac4ee096f2b7f7e3d6440
+---
+
+diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java
+index 10605ef..9eff261 100644
+--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java
++++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java
+@@ -407,6 +407,13 @@
+ 			if (ICDTLaunchConfigurationConstants.DEBUGGER_MODE_CORE.equals(config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)))
+ 				return true; 
+ 		}
++		if (mode.equals(ILaunchManager.RUN_MODE)) {
++			// We plan on splitting the Run delegate from the Debug one.
++			// For now, to keep backwards-compatibility, we need to keep the same delegate (to keep its id)
++			// However, we can just call the new delegate class
++			new LocalRunLaunchDelegate().preLaunchCheck(config, mode, monitor);
++		}
++
+ 		return super.preLaunchCheck(config, mode, monitor);
+ 	}
+ 
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index f62c200..5382b88 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -32,7 +32,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           %{?scl_prefix}eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        EPL and CPL
 URL:            http://www.eclipse.org/cdt
 
@@ -69,6 +69,12 @@ Patch6: remove-docker.patch
 # Following removes autotools and remote plugins from repo
 Patch7: remove-remote.patch
 
+# Following adds missing java resources to tests
+Patch9: %{pkg_name}-test-resources.patch
+
+# Following fixes missing exit code in console bug
+Patch10: %{pkg_name}-exit-code.patch
+
 BuildRequires: tycho
 BuildRequires: tycho-extras
 BuildRequires: %{?scl_prefix}eclipse-pde >= 1:4.3.0
@@ -173,6 +179,8 @@ cp %{SOURCE4} man
 %patch6 -p0
 %patch7 -p0
 %endif
+%patch9 -p0
+%patch10 -p1
 
 sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
 # Add secondary arch support if we are building there
@@ -482,6 +490,10 @@ rm -rf $installDir/eclipse/binary
 %endif
 
 %changelog
+* Mon Sep 21 2015 Jeff Johnston <jjohnstn@redhat.com> - 1:8.7.0-10
+- Fix missing test resources
+- Fix missing exit code in console
+
 * Tue Aug 04 2015 Roland Grunberg <rgrunber@redhat.com> - 1:8.7.0-9
 - Add script for automatically launching CDT Test Bundles.