[eclipse/f18: 18/18] This was done in the past - jdt.core should be a part of platform to avoid cyclic dependencies.

[Krzysztof Daniel]

commit eb056cece3ba428ab57c5afb5a525b164f78d8a1
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Mon Sep 10 10:49:35 2012 +0200

    This was done in the past - jdt.core should be a part of platform to
    avoid cyclic dependencies.

 eclipse-explicit-jdt-in-platform.patch |   14 ++++++++++++++
 eclipse.spec                           |    8 +++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-explicit-jdt-in-platform.patch b/eclipse-explicit-jdt-in-platform.patch
new file mode 100644
index 0000000..2fd6d2a
--- /dev/null
+++ b/eclipse-explicit-jdt-in-platform.patch
@@ -0,0 +1,14 @@
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml.bak	2012-07-25 17:26:52.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml	2012-09-10 10:46:53.027809695 +0200
+@@ -548,4 +548,10 @@
+          version="0.0.0"
+          unpack="false"/>
+ 
++   <plugin
++         id="org.eclipse.jdt.core"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
+ </feature>
+\ No newline at end of file
diff --git a/eclipse.spec b/eclipse.spec
index 42e91d1..e7105ad 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -33,7 +33,7 @@ ln -s %{_javadir}/%{2} ${_f}
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        17%{?dist}
+Release:        18%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -179,6 +179,8 @@ Patch29:        %{name}-test-support.patch
 
 Patch30:        %{name}-remove-tomcat6.patch
 
+Patch31:        %{name}-explicit-jdt-in-platform.patch
+
 BuildRequires:  ant >= 1.8.3
 BuildRequires:  rsync
 BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
@@ -399,6 +401,7 @@ tar --strip-components=1 -xf %{SOURCE1}
 %patch28
 %patch29
 %patch30
+%patch31
 
 #https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040
 %pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles .
@@ -1224,6 +1227,9 @@ rm -rf %{_bindir}/efj/
 %{_mavendepmapfragdir}/%{name}-equinox-osgi
 
 %changelog
+* Mon Sep 10 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-18
+- Explicit dependency to jdt in platform.
+
 * Fri Sep 7 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-17
 - Yet another version of the previous patch.