diff --git a/eclipse.spec b/eclipse.spec
index a4dc04c..ac3afbb 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,18 +1,11 @@
 # Uncomment this if you have pre-jpackage ant.
 #%%define ant  JAVA_HOME=%{java_home} classic-ant
 
-# This is needed because only the IBM JDK has libjawt.so,
-# but the user might have chosen some other JDK as the default.
-%define java_home	/usr/lib/jvm/java-ibm
-# This is used for requires and buildrequires.
-%define java_req	java-ibm >= 1.4.1
-
 # The intersection of the IBM-supported platforms and
 # the platforms we want.
-ExclusiveArch:		i386 ia64 ppc ppc64pseries
+ExclusiveArch:		i386 ia64 ppc ppc64
 
 %define pkg_summary     An open extensible IDE
-#%define tomcat4_dir     %{_var}/tomcat4
 %define section         free
 %define swt_version     3062
 %define corelib_version 2_1_0b
@@ -54,7 +47,7 @@ ExclusiveArch:		i386 ia64 ppc ppc64pseries
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        14
+Release:        15
 License:        CPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -102,7 +95,7 @@ BuildRequires:  %{_libdir}/pkgconfig/gtk+-2.0.pc
 # MDK 9.1: libglib2.0_0-devel
 # RH 8.0, 9, FC 1: glib2-devel
 BuildRequires:  %{_libdir}/pkgconfig/gthread-2.0.pc
-BuildRequires:	%{java_req}
+BuildRequires:	java >= 1.4.1
 
 
 %description
@@ -117,7 +110,7 @@ Group:          Text Editors/Integrated Development Environments (IDE)
 Provides:       %{name} = %{version}-%{release}
 Obsoletes:	%{name}-sdk
 Provides:	%{name}-sdk
-Requires:	%{java_req}
+Requires:	java >= 1.4.1
 
 %description    platform
 Eclipse platform common files.  In addition to this, you'll need the
@@ -406,7 +399,7 @@ popd
 
 ### begin libswt-gtk2 symlinks
 pushd $RPM_BUILD_ROOT%{_libdir}
-for base in atk-gtk awt-gtk gnome-gtk gtk pi-gtk; do
+for base in atk-gtk gnome-gtk gtk pi-gtk; do
   ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \
          libswt-${base}-%{swt_version}.so
 done
@@ -418,7 +411,7 @@ ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{ecli
 popd
 
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}
-for base in atk-gtk awt-gtk gnome-gtk gtk pi-gtk; do
+for base in atk-gtk gnome-gtk gtk pi-gtk; do
   ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \
          libswt-${base}-%{swt_version}.so
 done
@@ -516,7 +509,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{_libdir}/%{name}/libswt-gnome-gtk-*.so
 %attr(0755,root,root) %{_libdir}/%{name}/libswt-gtk-*.so
 %attr(0755,root,root) %{_libdir}/%{name}/libswt-pi-gtk-*.so
-%attr(0755,root,root) %{_libdir}/%{name}/libswt-awt-gtk-*.so
 %attr(0755,root,root) %{_libdir}/%{name}/libswt-atk-gtk-*.so
 %{_libdir}/libswt-*.so
 %{_jnidir}/swt-gtk*.jar
@@ -544,6 +536,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 19 2004 Tom Tromey <tromey@redhat.com> 3.0.0-15
+- Don't require IBM JDK
+- Don't build AWT/SWT interaction code
+
 * Fri Jul 16 2004 Tom Tromey <tromey@redhat.com> 3.0.0-14
 - Install copy-platform correctly