From e0e7c55979a5b3445cd9e0b2867f484264398f0b Mon Sep 17 00:00:00 2001
From: Krzysztof Daniel <kdaniel@redhat.com>
Date: Mon, 14 Oct 2013 18:46:08 +0200
Subject: [PATCH] Build right launcher version.

---
 eclipse-bug-386377.patch | 18 +++++++++---------
 eclipse.spec             |  5 ++++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/eclipse-bug-386377.patch b/eclipse-bug-386377.patch
index ac92081..4eac9ab 100644
--- a/eclipse-bug-386377.patch
+++ b/eclipse-bug-386377.patch
@@ -41,7 +41,7 @@ index 5a15c5b..d4fb54e 100644
 +                <phase>generate-resources</phase>
 +                <configuration>
 +                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/carbon/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/carbon/" target="build_eclipse"/>
++                    <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/carbon/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/carbon/" target="build_eclipse"/>
 +                  </target>
 +                </configuration>
 +                <goals>
@@ -105,7 +105,7 @@ index 59f46ae..e7616ed 100644
 +                <phase>generate-resources</phase>
 +                <configuration>
 +                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++                    <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
 +                  </target>
 +                </configuration>
 +                <goals>
@@ -169,7 +169,7 @@ index d639b6e..8bf7d74 100644
 +                <phase>generate-resources</phase>
 +                <configuration>
 +                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++                    <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
 +                  </target>
 +                </configuration>
 +                <goals>
@@ -234,7 +234,7 @@ index e0b59be..f82005c 100644
 +                <phase>generate-resources</phase>
 +                <configuration>
 +                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
++                    <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/win32/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/win32/" target="build_eclipse"/>
 +                  </target>
 +                </configuration>
 +                <goals>
@@ -299,7 +299,7 @@ index ce4252c..4b72b1f 100644
 +                <phase>generate-resources</phase>
 +                <configuration>
 +                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
++                    <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/win32/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/win32/" target="build_eclipse"/>
 +                  </target>
 +                </configuration>
 +                <goals>
@@ -364,7 +364,7 @@ index ce4252c..4b72b1f 100644
 +                <phase>generate-resources</phase>
 +                <configuration>
 +                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++                    <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
 +                  </target>
 +                </configuration>
 +                <goals>
@@ -429,7 +429,7 @@ index ce4252c..4b72b1f 100644
 +                <phase>generate-resources</phase>
 +                <configuration>
 +                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++                    <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
 +                  </target>
 +                </configuration>
 +                <goals>
@@ -494,7 +494,7 @@ index ce4252c..4b72b1f 100644
 +                <phase>generate-resources</phase>
 +                <configuration>
 +                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++                    <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
 +                  </target>
 +                </configuration>
 +                <goals>
@@ -559,7 +559,7 @@ index ce4252c..4b72b1f 100644
 +                <phase>generate-resources</phase>
 +                <configuration>
 +                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++                    <ant antfile="../../../../bundles/org.eclipse.equinox.executable/library/gtk/build.xml" dir="../../bundles/org.eclipse.equinox.executable/library/gtk/" target="build_eclipse"/>
 +                  </target>
 +                </configuration>
 +                <goals>
diff --git a/eclipse.spec b/eclipse.spec
index 705e447..9929607 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -51,7 +51,7 @@ fi;
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -1034,6 +1034,9 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Mon Oct 14 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.1-5
+- Build right launcher version.
+
 * Thu Oct 10 2013 Roland Grunberg <rgrunber@redhat.com> - 1:4.3.1-4
 - Move testbundle-to-eclipse-test into eclipse-build upstream.