From babd31e442e984e55b890b10316a63278a930a4d Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Mon, 27 Aug 2012 14:01:42 +0200 Subject: [PATCH] Get rid off the set 1.6 patch. Tycho can properly resolve the EE for target platform :-). --- eclipse-set-1.6-bree.patch | 11 ----------- eclipse.spec | 6 +----- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 eclipse-set-1.6-bree.patch diff --git a/eclipse-set-1.6-bree.patch b/eclipse-set-1.6-bree.patch deleted file mode 100644 index 311c2be..0000000 --- a/eclipse-set-1.6-bree.patch +++ /dev/null @@ -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. - --> -- ?J2SE-1.4 -+ ?JavaSE-1.6 - - - diff --git a/eclipse.spec b/eclipse.spec index 6821a39..32163ea 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: 12%{?dist} +Release: 13%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) 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 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 Patch3: %{name}-fix-icu-import.patch @@ -269,7 +266,6 @@ tar --strip-components=1 -xf %{SOURCE1} %patch0 %patch1 -%patch2 %patch3 %patch4 %patch5