diff --git a/eclipse.spec b/eclipse.spec
index 18dafbd..bfdd6cc 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -36,7 +36,7 @@ Epoch:	1
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0jpp_0fc.3.2RC7.3
+Release:        0jpp_0fc.3.2RC7.4
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -153,7 +153,7 @@ BuildRequires:  unzip
 BuildRequires:  java-javadoc
 %if %{gcj_support}
 BuildRequires:	gcc-java >= 4.0.2
-BuildRequires:	java-gcj-compat-devel >= 1.0.43
+BuildRequires:	java-gcj-compat-devel >= 1.0.52
 BuildRequires:  dos2unix
 %else
 BuildRequires:	java-devel >= 1.4.2
@@ -177,8 +177,8 @@ BuildRequires: lucene
 BuildRequires: regexp 
 BuildRequires: junit >= 3.8.1-3jpp
 %if %{gcj_support}
-Requires(post):   java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires(post):   java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %endif
 
 %description
@@ -194,8 +194,8 @@ Obsoletes:	ecj
 Provides:	ecj
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):	java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires(post):	java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %else
 Requires:	java >= 1.4.2
 %endif
@@ -214,9 +214,9 @@ Provides:       %{name}-scripts = %{epoch}:%{version}-%{release}
 Provides:       %{name}-gtk2 = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires:	java-gcj-compat >= 1.0.43
-Requires(post):   java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires:	java-gcj-compat >= 1.0.52
+Requires(post):   java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %else
 Requires:	java >= 1.4.2
 %endif
@@ -270,8 +270,8 @@ Requires(post):   %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires(post):   java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %endif
 
 %description    jdt
@@ -298,8 +298,8 @@ Requires(post):   %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires(post):   java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %endif
 
 %description    pde
@@ -314,8 +314,8 @@ Requires(post):   %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires(post):   java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %endif
 
 %description    pde-runtime
@@ -339,8 +339,8 @@ Summary:        SWT Library for GTK2
 Group:          Text Editors/Integrated Development Environments (IDE)
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires(post):   java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %endif
 
 %description -n %{libname}-gtk2
@@ -351,8 +351,8 @@ Summary:        Eclipse Rich Client Platform
 Group:          Development/Languages
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.2
-Requires(post):   java-gcj-compat >= 1.0.43
-Requires(postun): java-gcj-compat >= 1.0.43
+Requires(post):   java-gcj-compat >= 1.0.52
+Requires(postun): java-gcj-compat >= 1.0.52
 %else
 Requires:	java >= 1.4.2
 %endif
@@ -899,8 +899,9 @@ for base in awt-gtk atk-gtk cairo-gtk mozilla-gtk gnome-gtk gtk pi-gtk glx-gtk; 
 done
 popd
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+swtjarversion=$(grep v$SWT_VERSION plugins/org.eclipse.swt/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
 pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.v$SWT_VERSION*.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
+ln -s %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$swtjarversion.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
 ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
 popd
 ### end libswt-gtk2 symlinks
@@ -1105,7 +1106,9 @@ ln -sf %{_javadir}/junit.jar plugins/org.junit_*/junit.jar
 # Symlink org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar in
 # %{_datadir}/java/eclipse-ecj.jar for java-1.4.2-gcj-compat's "javac"
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/java
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}*.jar \
+jdtcoreversion=$(grep "compiler\.version = 0\..*, 3.2.0" batch/org/eclipse/jdt/internal/compiler/batch/messages.properties | \
+                 sed "s/^compiler\.version = 0\.\(.*\), 3.2.0 release/\1/")
+ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.v_$jdtcoreversion.jar \
   $RPM_BUILD_ROOT%{_datadir}/java/eclipse-ecj.jar
 ln -s %{_datadir}/java/eclipse-ecj.jar \
   $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar
@@ -1625,6 +1628,11 @@ fi
 %endif
 
 %changelog
+* Mon Jun 12 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-0jpp_0fc.3.2RC7.4
+- Require java-gcj-compat 1.0.52.
+- Don't use '*' to set the quatifier name in the eclipse-ecj symlink.
+- Really fix swt symlinks rh #194500.
+
 * Wed Jun 07 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-0jpp_0fc.3.2RC7.3
 - Enable ppc64, s390 and s390x.
 - Add check for jars at the end of prep.