Bug 213437 org.eclipse.platform, org.eclipse.rcp features references non-existing bundles
diff --git a/features/org.eclipse.rcp/build.properties b/features/org.eclipse.rcp/build.properties
index cedb946..07175f8 100644
--- a/features/org.eclipse.rcp/build.properties
+++ b/features/org.eclipse.rcp/build.properties
@@ -27,6 +27,10 @@
 
 root.linux.gtk.x86=../../features/org.eclipse.platform/about_files/linux.gtk.x86,../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86
 root.linux.gtk.x86.permissions.755=*.so*
+root.linux.gtk.s390=../../features/org.eclipse.platform/about_files/linux.gtk.s390,../../features/org.eclipse.equinox.executable/contributed/gtk/linux/s390
+root.linux.gtk.s390.permissions.755=*.so*
+root.linux.gtk.s390x=../../features/org.eclipse.platform/about_files/linux.gtk.s390x,../../features/org.eclipse.equinox.executable/contributed/gtk/linux/s390x
+root.linux.gtk.s390x.permissions.755=*.so*
 root.linux.gtk.ppc=../../features/org.eclipse.equinox.executable/bin/gtk/linux/ppc
 root.linux.gtk.x86_64=../../features/org.eclipse.platform/about_files/linux.gtk.x86_64,../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
 root.linux.gtk.x86_64.permissions.755=*.so*
diff --git a/features/org.eclipse.rcp/feature.xml b/features/org.eclipse.rcp/feature.xml
index 40e20eb..2404383 100644
--- a/features/org.eclipse.rcp/feature.xml
+++ b/features/org.eclipse.rcp/feature.xml
@@ -214,7 +214,7 @@
          install-size="0"
          version="0.0.0"
          fragment="true"
-         unpack="false"/> 
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.swt.gtk.linux.x86"
@@ -226,7 +226,29 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
- 
+
+   <plugin
+         id="org.eclipse.swt.gtk.linux.s390"
+         os="linux"
+         ws="gtk"
+         arch="s390"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.gtk.linux.s390x"
+         os="linux"
+         ws="gtk"
+         arch="s390x"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
    <plugin
          id="org.eclipse.swt.gtk.solaris.sparc"
          os="solaris"
@@ -534,7 +556,27 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-  
+
+   <plugin
+         id="org.eclipse.equinox.launcher.gtk.linux.s390"
+         os="linux"
+         ws="gtk"
+         arch="s390"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.launcher.gtk.linux.s390x"
+         os="linux"
+         ws="gtk"
+         arch="s390x"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
    <plugin
          id="org.eclipse.equinox.launcher.motif.linux.x86"
          os="linux"
@@ -614,6 +656,6 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-  
+
 
 </feature>
diff --git a/oldfeatures/org.eclipse.platform-feature/build.properties b/oldfeatures/org.eclipse.platform-feature/build.properties
index 1f1275c..5086282 100644
--- a/oldfeatures/org.eclipse.platform-feature/build.properties
+++ b/oldfeatures/org.eclipse.platform-feature/build.properties
@@ -35,6 +35,10 @@
 
 root.linux.gtk.x86=about_files/linux.gtk.x86,../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86,gtk
 root.linux.gtk.x86.permissions.755=*.so*
+root.linux.gtk.s390=about_files/linux.gtk.s390,../../features/org.eclipse.equinox.executable/contributed/gtk/linux/s390,gtk
+root.linux.gtk.s390.permissions.755=*.so*
+root.linux.gtk.s390x=about_files/linux.gtk.s390x,../../features/org.eclipse.equinox.executable/contributed/gtk/linux/s390x,gtk
+root.linux.gtk.s390x.permissions.755=*.so*
 root.linux.gtk.x86_64=about_files/linux.gtk.x86_64,../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86_64,gtk
 root.linux.gtk.x86_64.permissions.755=*.so*
 root.linux.gtk.ppc=../../features/org.eclipse.equinox.executable/bin/gtk/linux/ppc,gtk
diff --git a/oldfeatures/org.eclipse.platform-feature/feature.xml b/oldfeatures/org.eclipse.platform-feature/feature.xml
index 1f30206..f29b786 100644
--- a/oldfeatures/org.eclipse.platform-feature/feature.xml
+++ b/oldfeatures/org.eclipse.platform-feature/feature.xml
@@ -501,7 +501,7 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
- 
+
    <plugin
          id="org.eclipse.core.resources.win32.x86"
          os="win32"
@@ -513,6 +513,16 @@
          unpack="false"/>
 
    <plugin
+         id="org.eclipse.core.resources.win32.ia64"
+         os="win32"
+         arch="ia64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.core.variables"
          download-size="0"
          install-size="0"