Get rid off the set 1.6 patch.

Tycho can properly resolve the EE for target platform :-).
This commit is contained in:
Krzysztof Daniel 2012-08-27 14:01:42 +02:00
parent c0f90a91f2
commit babd31e442
2 changed files with 1 additions and 16 deletions

View File

@ -1,11 +0,0 @@
--- eclipse-parent/pom.xml.old 2012-07-26 13:10:45.117816261 +0200
+++ eclipse-parent/pom.xml 2012-07-26 13:07:41.336610064 +0200
@@ -96,7 +96,7 @@
packages. This makes J2SE-1.4 effectively the minimal execution environment required by eclipse platform
build since many platform bundles directly or indirectly depend on org.eclipse.equinox.security.
-->
- <executionEnvironment>?J2SE-1.4</executionEnvironment>
+ <executionEnvironment>?JavaSE-1.6</executionEnvironment>
<environments>
<environment>

View File

@ -33,7 +33,7 @@ ln -s %{_javadir}/%{2} ${_f}
Summary: An open, extensible IDE Summary: An open, extensible IDE
Name: eclipse Name: eclipse
Version: %{eclipse_version} Version: %{eclipse_version}
Release: 12%{?dist} Release: 13%{?dist}
License: EPL License: EPL
Group: Text Editors/Integrated Development Environments (IDE) Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/ URL: http://www.eclipse.org/
@ -63,9 +63,6 @@ Patch0: %{name}-help-feature-adjust-dependencies.patch
# +org.apache.geronimo.specs.geronimo-annotation_1.1_spec # +org.apache.geronimo.specs.geronimo-annotation_1.1_spec
Patch1: %{name}-remove-w3c-smil-and-use-geronimo.patch Patch1: %{name}-remove-w3c-smil-and-use-geronimo.patch
# 1.4 -> 1.6
Patch2: %{name}-set-1.6-bree.patch
# com.ibm.icu.base -> com.ibm.icu # com.ibm.icu.base -> com.ibm.icu
Patch3: %{name}-fix-icu-import.patch Patch3: %{name}-fix-icu-import.patch
@ -269,7 +266,6 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch0 %patch0
%patch1 %patch1
%patch2
%patch3 %patch3
%patch4 %patch4
%patch5 %patch5