[eclipse-rse] Remove tycho keep local target option.

[Jeff Johnston]

commit 1f1133ff43a007f7664f9f16899053726f572230
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Mon Apr 8 17:38:09 2013 -0400

    Remove tycho keep local target option.

 eclipse-rse-top-pom.patch |   20 ++++++++++----------
 eclipse-rse.spec          |    6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/eclipse-rse-top-pom.patch b/eclipse-rse-top-pom.patch
index fbe7d2e..925dc16 100644
--- a/eclipse-rse-top-pom.patch
+++ b/eclipse-rse-top-pom.patch
@@ -1,6 +1,6 @@
-diff -up ./pom.xml.fix5 ./pom.xml
---- ./pom.xml.fix5	2013-04-04 18:15:14.000000000 -0400
-+++ ./pom.xml	2013-04-04 18:56:47.000000000 -0400
+diff -up ./pom.xml.orig ./pom.xml
+--- ./pom.xml.orig	2013-04-05 11:58:24.000000000 -0400
++++ ./pom.xml	2013-04-05 17:18:33.000000000 -0400
 @@ -14,11 +14,11 @@
    <prerequisites>
      <maven>3.0</maven>
@@ -15,7 +15,7 @@ diff -up ./pom.xml.fix5 ./pom.xml
    <groupId>org.eclipse.tm</groupId>
    <artifactId>tm-parent</artifactId>
    <version>3.8.0-SNAPSHOT</version>
-@@ -263,13 +263,16 @@
+@@ -264,13 +264,16 @@
      <!--   <module>rse/plugins/org.eclipse.rse.useractions.sdk</module> -->
      <module>releng/org.eclipse.tm.repo</module>
      <module>terminal/plugins/org.eclipse.tm.terminal</module>
@@ -33,7 +33,7 @@ diff -up ./pom.xml.fix5 ./pom.xml
      <module>terminal/features/org.eclipse.tm.terminal.serial-feature</module>
      <module>terminal/features/org.eclipse.tm.terminal.ssh-feature</module>
      <module>terminal/features/org.eclipse.tm.terminal.telnet-feature</module>
-@@ -286,6 +289,7 @@
+@@ -287,6 +290,7 @@
      <module>wince/org.eclipse.rse.wince-feature</module>
      <module>wince/org.eclipse.rse.subsystems.wince</module>
      <module>wince/org.eclipse.tm.rapi</module>
@@ -41,9 +41,9 @@ diff -up ./pom.xml.fix5 ./pom.xml
    </modules>
    <build>
      <plugins>
-@@ -323,41 +327,6 @@
+@@ -324,41 +328,6 @@
                  <ws>gtk</ws>
-                 <arch>x86_64</arch>
+                 <arch>x86</arch>
                </environment>
 -              <environment>
 -                <os>linux</os>
@@ -58,7 +58,7 @@ diff -up ./pom.xml.fix5 ./pom.xml
 -              <environment>
 -                <os>win32</os>
 -                <ws>win32</ws>
--                <arch>x86_64</arch>
+-                <arch>x86</arch>
 -              </environment>
 -              <environment>
 -                <os>win32</os>
@@ -68,7 +68,7 @@ diff -up ./pom.xml.fix5 ./pom.xml
 -              <environment>
 -                <os>macosx</os>
 -                <ws>cocoa</ws>
--                <arch>x86_64</arch>
+-                <arch>x86</arch>
 -              </environment>
 -              <environment>
 -                <os>macosx</os>
@@ -83,7 +83,7 @@ diff -up ./pom.xml.fix5 ./pom.xml
              </environments>
              <resolver>p2</resolver>
              <ignoreTychoRepositories>true</ignoreTychoRepositories>
-@@ -368,14 +337,14 @@
+@@ -369,14 +338,14 @@
                  <type>eclipse-plugin</type>
                  <id>org.apache.commons.net</id>
                  <restrictTo>
diff --git a/eclipse-rse.spec b/eclipse-rse.spec
index 43b4ffa..13e1cd4 100644
--- a/eclipse-rse.spec
+++ b/eclipse-rse.spec
@@ -90,13 +90,13 @@ The Remote System Explorer (RSE) framework server that can be used so clients ca
 
 pushd %{rse_snapshot}
 
-sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
-
 %patch3
 %patch4
 %patch5
 %patch6
 
+sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
+
 pushd rse/plugins/org.eclipse.rse.services.dstore
 %patch1
 %patch2
@@ -108,7 +108,7 @@ popd
 
 pushd %{rse_snapshot}
 
-mvn-rpmbuild -o -DskipTychoVersionCheck -Dmaven.test.skip=true -Dtycho.local.keepTarget -fae clean install
+mvn-rpmbuild -o -DskipTychoVersionCheck -Dmaven.test.skip=true -fae clean install
 
 cp %{SOURCE4} .
 cp %{SOURCE5} .