From 1695dc11fd237fc00918a228b4883d3e7346f3d6 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Oct 01 2014 08:40:54 +0000
Subject: Fix s390 launcher build


---

diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index b069b20..34b52d9 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -222,7 +222,7 @@ diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.featur
 index fac13bf..e487001 100644
 --- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
 +++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
-@@ -259,6 +259,129 @@
+@@ -219,6 +219,189 @@
          </plugins>
        </build>
      </profile>
@@ -348,10 +348,79 @@ index fac13bf..e487001 100644
 +        </plugins>
 +      </build>
 +    </profile>
++    <profile>
++      <id>build-native-launchers-gtk.linux.s390x</id>
++      <activation>
++        <property>
++          <name>native</name>
++          <value>gtk.linux.s390x</value>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
++                  </target>
++                </configuration>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++              </execution>
++            </executions>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++    <profile>
++      <id>build-native-launchers-gtk.linux.s390</id>
++      <activation>
++        <property>
++          <name>native</name>
++          <value>gtk.linux.s390</value>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
++                  </target>
++                </configuration>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++              </execution>
++            </executions>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
 +
      <profile>
        <id>build-native-launchers-win32.win32.x86_64</id>
        <activation>
+@@ -530,8 +530,6 @@
+                         <include name="gtk/solaris/x86/**/*" />
+                         <include name="win32/win32/x86/**/*" />
+                         <include name="win32/win32/x86_64/**/*" />
+-                      </fileset>
+-                      <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/">
+                         <include name="gtk/linux/s390/**/*" />
+                         <include name="gtk/linux/s390x/**/*" />
+                       </fileset>
 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml	2014-05-26 19:20:28.958177815 +0300
 +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml	2014-05-26 19:33:42.942025740 +0300
 @@ -30,6 +30,64 @@
diff --git a/eclipse.spec b/eclipse.spec
index 8263dc2..6c2543f 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -38,7 +38,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -1017,6 +1017,9 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Wed Oct 01 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-2
+- Fix s390 launcher build
+
 * Fri Sep 26 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-1
 - Update to Luna SR1
 - Drop upstreamed patch and fix permissions on appdata files