diff --git a/.cvsignore b/.cvsignore
index da8cf47..999895f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-eclipse-sourceBuild-srcIncluded-3.1.2.zip
-eclipse-fedora-splash-3.1.2.png
+eclipse-sourceBuild-srcIncluded-3.2RC7.zip
+eclipse-fedora-splash-3.2rc7.png
diff --git a/eclipse.spec b/eclipse.spec
index befc60e..a7261c2 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -11,8 +11,6 @@ Epoch:	1
 %define tomcatlibdir 	%{_var}/lib/tomcat5
 %define pkg_summary     An open, extensible IDE
 %define section         free
-# FIXME automate this
-%define swt_version     3232
 %define eclipse_major   3
 %define eclipse_minor   2
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
@@ -39,11 +37,11 @@ Epoch:	1
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0jpp_0fc.3.2RC6
+Release:        0jpp_0fc.3.2RC7
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:	http://download.eclipse.org/eclipse/downloads/drops/S-3.2RC6-200605260010/eclipse-sourceBuild-srcIncluded-3.2RC6.zip
+Source0:	http://download.eclipse.org/eclipse/downloads/drops/S-3.2RC7-200606021317/eclipse-sourceBuild-srcIncluded-3.2RC7.zip
 Source2:        %{name}.desktop
 Source5:        %{name}-48.png
 Source6:        %{name}.conf
@@ -751,6 +749,11 @@ ant \
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# get swt version
+SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
+
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 tar -C $RPM_BUILD_ROOT%{_datadir} -zxf \
@@ -783,7 +786,7 @@ for l in `find configuration -name \*.so`; do
     popd;
     # SWT bundle stuff should go in libswt3-gtk
     # Contents of other bundles should go in eclipse-platform
-    if [ "`basename $l`" = "libswt-gtk-%{swt_version}.so" ]
+    if [ "`basename $l`" = "libswt-gtk-$SWT_VERSION.so" ]
     then
         pushd `dirname $l`;
           cd ../..;
@@ -837,14 +840,14 @@ popd
 ### begin libswt-gtk2 symlinks
 pushd $RPM_BUILD_ROOT%{_libdir}
 for base in awt-gtk atk-gtk cairo-gtk mozilla-gtk gnome-gtk gtk pi-gtk glx-gtk; do
-  ln -s %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \
-         libswt-${base}-%{swt_version}.so
+  ln -s %{_libdir}/%{name}/libswt-${base}-$SWT_VERSION.so \
+         libswt-${base}-$SWT_VERSION.so
 done
 popd
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 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 %{_javadir}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.v%{swt_version}.jar swt-gtk-%{eclipse-majmin}.jar
+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 %{_javadir}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.v$SWT_VERSION.jar swt-gtk-%{eclipse-majmin}.jar
 popd
 ### end libswt-gtk2 symlinks
 
@@ -986,9 +989,9 @@ ln -s %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_1.6.5/lib/ant-trax.jar
 #ln -s %{_javadir}/ant/ant-xslp.jar plugins/org.apache.ant_1.6.5/lib/ant-xslp.jar
 ## END ANT ##
 # BEGIN LUCENE ##
-rm plugins/org.apache.lucene_*/lucene-1.4.3.jar
-# FIXME:
-ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene_1.4.103.v20060510a/lucene-1.4.3.jar
+# FIXME: rm -f in ln
+#rm plugins/org.apache.lucene_*/lucene-1.4.3.jar
+ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene_*/lucene-1.4.3.jar
 # END LUCENE ##
 # FIXME
 #rm plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
@@ -1037,9 +1040,9 @@ ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene_1.4.103.v20060510a/lucene
 #ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/tomcat-http11.jar
 #ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/tomcat-util.jar
 ## END TOMCAT ##
-# FIXME
-rm plugins/org.junit_*/junit.jar
-ln -s %{_javadir}/junit.jar plugins/org.junit_3.8.1/junit.jar
+# FIXME rm -f in ln
+#rm plugins/org.junit_*/junit.jar
+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"
@@ -1511,6 +1514,8 @@ fi
 %{_libdir}/gcj/%{name}/org.eclipse.search_*
 %{_libdir}/gcj/%{name}/org.eclipse.text_*
 %{_libdir}/gcj/%{name}/com.ibm.icu_*
+# FIXME: take this out when the tomcat patch is updated
+%{_libdir}/gcj/%{name}/*
 %endif
 
 %files platform-devel
diff --git a/sources b/sources
index aeef51d..8134877 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f2c8066151de14c5ccdf420266ce9f39  eclipse-sourceBuild-srcIncluded-3.1.2.zip
-1ee1e19362e3ee4d3b67a6dea18961de  eclipse-fedora-splash-3.1.2.png
+9fa62b56c209713a32296f3ac65cf1d0  eclipse-sourceBuild-srcIncluded-3.2RC7.zip
+f7837f724789b30537d2afe1b8b77161  eclipse-fedora-splash-3.2rc7.png