[eclipse-dltk/f17] Remove patches and functionality that are integrated into Fedora Tycho.

[swagiaal]

commit 5fdef0a17af38cf7320069e6d1056173d44549f6
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Thu Jun 14 14:52:30 2012 -0400

    Remove patches and functionality that are integrated into Fedora Tycho.
    
    Remove patches that bump BREE to JavaSE-1.6, as this is done by Tycho
    during build. Also, remove the patch and %%prep lines that create a
    local p2 repository as this is done as part of the Tycho build in
    Fedora.

 add-local-fedora-repo.patch              |   27 -
 eclipse-dltk.spec                        |   34 +-
 use-JavaSE-1.6-instead-of-J2SE-1.4.patch |  319 ----------
 use-JavaSE-1.6-instead-of-J2SE-1.5.patch |  978 ------------------------------
 4 files changed, 12 insertions(+), 1346 deletions(-)
---
diff --git a/eclipse-dltk.spec b/eclipse-dltk.spec
index d30ab04..f39d730 100644
--- a/eclipse-dltk.spec
+++ b/eclipse-dltk.spec
@@ -2,7 +2,7 @@
 
 Name:      eclipse-dltk
 Version:   4.0.0
-Release:   0.4.201201070225cvs%{?dist}
+Release:   0.5.201201070225cvs%{?dist}
 Summary:   Dynamic Languages Toolkit (DLTK) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -14,16 +14,13 @@ URL:       http://www.eclipse.org/dltk/
 Source0:   dltk-%{version}.tar.xz
 Source1:   get-dltk.sh
 
-Patch1: add-local-fedora-repo.patch
-Patch2: remove-dependencies-on-empty-source-bundles.patch
-Patch3: use-JavaSE-1.6-instead-of-J2SE-1.4.patch
-Patch4: correct-mismatched-feature-and-artifactIds.patch
-Patch5: remove-missing-files-from-build.properties-files.patch 
-Patch6: use-JavaSE-1.6-instead-of-J2SE-1.5.patch
-Patch7: correct-required-version-of-org.eclipse.rse.services.ssh.patch 
-Patch8: disable-specific-environment-settings.patch
-Patch9: disable-javascript-and-python.patch
-Patch10: rename-tycho-plugins-to-0.14.0-names.patch
+Patch1: remove-dependencies-on-empty-source-bundles.patch
+Patch2: correct-mismatched-feature-and-artifactIds.patch
+Patch3: remove-missing-files-from-build.properties-files.patch
+Patch4: correct-required-version-of-org.eclipse.rse.services.ssh.patch
+Patch5: disable-specific-environment-settings.patch
+Patch6: disable-javascript-and-python.patch
+Patch7: rename-tycho-plugins-to-0.14.0-names.patch
 
 BuildArch:        noarch
 
@@ -144,9 +141,6 @@ Documentation and source for the Eclipse Dynamic Languages Toolkit (DLTK).
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 # make sure upstream hasn't sneaked in any jars we don't know about
 JARS=""
@@ -173,14 +167,6 @@ OPTIONS="-DforceContextQualifier=v201201070225 -Dmaven.test.skip=true clean inst
 #export PATH=%{java_bin}:/usr/bin:$PATH
 
 # Ensure that all required dependencies are available in a local p2 repo                                
-/bin/sh -x %{_eclipse_base}/buildscripts/copy-platform SDK \
-  %{_eclipse_base} emf rse mylyn mylyn-commons mylyn-ide mylyn-context
-
-ln -s %{_javadir}/h2.jar SDK/plugins/h2.jar
-
-eclipse -debug -consolelog -nosplash -verbose -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher -me\
-tadataRepository file:$PWD/myrepo -artifactRepository file:$PWD/myrepo -source $PWD/SDK -compress -append -publishArtifacts
-
 # build all features
 pushd build
 mvn-rpmbuild $OPTIONS
@@ -265,6 +251,10 @@ popd
 %doc core/features/org.eclipse.dltk.core.sdk/rootfiles/*
 
 %changelog
+* Thu Jun 14 2012 Roland Grunberg <rgrunber at redhat.com> - 4.0.0-0.5.201201070225cvs
+- Remove patches that bump BREE to JavaSE-1.6 (done by Tycho).
+- Remove patch and %%prep lines that create p2 repository (done by Tycho).
+
 * Thu May 03 2012 Sami Wagiaalla <swagiaal at redhat.com> - 4.0.0-0.4.201201070225cvs
 - Install a symlink to h2 in dropins.
 - Remove blanket symlink of javadir.