[eclipse-cdt] - Fix summary for parsers sub-package. - Patch CDT dsf tests to not require junit4.

[Jeff Johnston]

commit 455600de4087534b5fe6b5cfa49c7832c32226f3
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Wed Mar 6 13:09:33 2013 -0500

    - Fix summary for parsers sub-package.
    - Patch CDT dsf tests to not require junit4.

 eclipse-cdt-dsf-tests.patch |   12 ++++++++++++
 eclipse-cdt.spec            |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-cdt-dsf-tests.patch b/eclipse-cdt-dsf-tests.patch
new file mode 100644
index 0000000..42d30f1
--- /dev/null
+++ b/eclipse-cdt-dsf-tests.patch
@@ -0,0 +1,12 @@
+diff -up ./dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF.fix ./dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF
+--- ./dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF.fix	2013-03-05 18:49:22.000000000 -0500
++++ ./dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF	2013-03-05 18:49:51.000000000 -0500
+@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.core.runtime
+  org.eclipse.cdt.dsf,
+  org.eclipse.cdt.core,
+  org.eclipse.cdt.debug.core,
+- org.junit4,
++ org.junit;bundle-version="4.8.1",
+  org.eclipse.debug.core,
+  org.eclipse.swt,
+  org.eclipse.cdt.launch;bundle-version="6.1.0",
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 30fff87..55229de 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -53,6 +53,9 @@ Patch0: %{name}-tycho-build.patch
 Patch1: %{name}-libhover-local-libstdcxx.patch
 Patch2: %{name}-libhover-libstdcxx.patch
 
+# Following fixes an org.junit4 reference in the CDT to use org.junit instead
+Patch3: %{name}-dsf-tests.patch
+
 BuildRequires: tycho
 BuildRequires: tycho-extras
 BuildRequires: eclipse-pde >= 1:3.8.0
@@ -97,6 +100,7 @@ Source for Eclipse CDT for use within Eclipse.
 
 pushd %{cdt_snapshot}
 %patch0 -p1
+%patch3 -p1
 sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
 # Add secondary arch support if we are building there
 %ifarch %{arm} s390 s390x
@@ -265,8 +269,9 @@ rm -rf $installDir/eclipse/binary
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
-* Fri Mar 01 2013 Jeff Johnston <jjohnstn at redhat.com> - 1:8.1.1-5
+* Fri Mar 06 2013 Jeff Johnston <jjohnstn at redhat.com> - 1:8.1.1-5
 - Fix summary for parsers sub-package.
+- Patch CDT dsf tests to not require junit4.
 
 * Wed Feb 06 2013 Java SIG <java-devel at lists.fedoraproject.org> - 1:8.1.1-4
 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild