diff --git a/eclipse.spec b/eclipse.spec
index 812511f..b370f08 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -23,15 +23,13 @@ ExclusiveArch: i386 x86_64 ppc
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:        0.M6.8
+Release:        0.M6.9
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
 Source0: 	http://download.eclipse.org/eclipse/downloads/drops/S-3.1M6-200504011645/eclipse-sourceBuild-srcIncluded-3.1M6.zip
 Source1:        %{name}.script
 Source2:        %{name}.desktop
-Source3:        %{name}-16.gif
-Source4:        %{name}-32.gif
 Source5:        %{name}-48.png
 Source6:        %{name}.conf
 Source7:        %{name}-jdt.install
@@ -386,152 +384,154 @@ popd
 ORIGCLASSPATH=$CLASSPATH
 
 %if %{gcj_support}
-# Bootstrapping is 3 parts:
-# 1. Build ecj with gcj -C 
-# 2. Build ecj with gcj-built ecj ("javac")
-# 3. Re-build ecj with output of 2.
-
-# Unzip the "stable compiler" source into a temp dir and build it.
-# Note: we don't want to build the CompilerAdapter.
-mkdir ecj-bootstrap-tmp
-unzip -qq -d ecj-bootstrap-tmp jdtcoresrc/src/jdtcore.zip
-rm -f ecj-bootstrap-tmp/org/eclipse/jdt/core/JDTCompilerAdapter.java
-
-# 1a. Build ecj with gcj -C
-pushd ecj-bootstrap-tmp
-for f in `find -name '*.java' | cut -c 3-`; do
-    gcj -Wno-deprecated -C $f
-done
-find -name '*.class' -or -name '*.properties' -or -name '*.rsc' |\
-    xargs jar cf ../ecj-bootstrap.jar
-popd
-
-# Delete our modified jdtcore and restore the backup
-rm -rf ecj-bootstrap-tmp
-
-## 1b. Natively-compile it
-#gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
-#  -o ecj-bootstrap.jar.so ecj-bootstrap.jar
-#
-#gcj-dbtool -n bootstrap.db 30000
-#gcj-dbtool -a bootstrap.db ecj-bootstrap.jar{,.so}
-#
-#export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/bootstrap.db"
-
-# 2a. Build ecj
-export CLASSPATH=ecj-bootstrap.jar:$ORIGCLASSPATH
+  # Bootstrapping is 3 parts:
+  # 1. Build ecj with gcj -C 
+  # 2. Build ecj with gcj-built ecj ("javac")
+  # 3. Re-build ecj with output of 2.
+  
+  # Unzip the "stable compiler" source into a temp dir and build it.
+  # Note:  we don't want to build the CompilerAdapter.
+  mkdir ecj-bootstrap-tmp
+  unzip -qq -d ecj-bootstrap-tmp jdtcoresrc/src/jdtcore.zip
+  rm -f ecj-bootstrap-tmp/org/eclipse/jdt/core/JDTCompilerAdapter.java
+  
+  # 1a. Build ecj with gcj -C
+  pushd ecj-bootstrap-tmp
+  for f in `find -name '*.java' | cut -c 3-`; do
+      gcj -Wno-deprecated -C $f
+  done
+  find -name '*.class' -or -name '*.properties' -or -name '*.rsc' |\
+      xargs jar cf ../ecj-bootstrap.jar
+  popd
+  
+  # Delete our modified jdtcore and restore the backup
+  rm -rf ecj-bootstrap-tmp
+  
+  ## 1b. Natively-compile it
+  #gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+  #  -o ecj-bootstrap.jar.so ecj-bootstrap.jar
+  #
+  #gcj-dbtool -n ecj-bootstrap.db 30000
+  #gcj-dbtool -a ecj-bootstrap.db ecj-bootstrap.jar{,.so}
+  #
+  ## 2a. Build ecj
+  export CLASSPATH=ecj-bootstrap.jar:$ORIGCLASSPATH
+  #export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db"
 %endif
 ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
 
 %if %{gcj_support}
-## 2b. Natively-compile ecj
-#gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
-#  -o jdtcoresrc/ecj.jar.so jdtcoresrc/ecj.jar
-#
-#gcj-dbtool -n jdtcoresrc/ecj.db 30000
-#gcj-dbtool -a jdtcoresrc/ecj.db jdtcoresrc/ecj.jar{,.so}
-#export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db"
-
-# Remove our gcj-built ecj
-#rm bootstrap.db ecj-bootstrap.jar
-rm ecj-bootstrap.jar
+#  # 2b. Natively-compile ecj
+#  gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+#    -o jdtcoresrc/jdtcore.jar.so jdtcoresrc/jdtcore.jar
+#  
+#  gcj-dbtool -n jdtcoresrc/jdtcore.db 30000
+#  gcj-dbtool -a jdtcoresrc/jdtcore.db jdtcoresrc/jdtcore.jar{,.so}
+#  export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/jdtcore.db"
+  
+  # Remove our gcj-built ecj
+  #rm ecj-bootstrap.db ecj-bootstrap.jar
+  rm ecj-bootstrap.jar
 %endif
 
 # 3. Use this ecj to rebuild itself
 export CLASSPATH=`pwd`/jdtcoresrc/jdtcore.jar:$ORIGCLASSPATH
 ant -buildfile jdtcoresrc/compilejdtcore.xml
 
-#%if %{gcj_support}
-## Natively-compile it
-#gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
-#  -o ecj.jar.so ecj.jar
-#gcj-dbtool -n ecj.db 30000
-#gcj-dbtool -a ecj.db ecj.jar{,.so}
-
-# Remove old native bits
-#rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so
-#%endif
+%if %{gcj_support}
+#  # Natively-compile it
+#  gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+#    -o jdtcore.jar.so jdtcore.jar
+#  gcj-dbtool -n jdtcore.db 30000
+#  gcj-dbtool -a jdtcore.db jdtcore.jar{,.so}
+#  export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/jdtcore.db"
+#  
+#  # Remove old native bits
+#  rm jdtcoresrc/jdtcore.db jdtcoresrc/jdtcore.jar.so
+%endif
 
 # Build the rest of Eclipse
 export CLASSPATH=`pwd`/jdtcore.jar:$ORIGCLASSPATH
-#export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/ecj.db"
 ant \
   -Dnobootstrap=true \
   -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
   -Dlibsconfig=true
 
 %if %{gcj_support}
-pushd result
-# De-compress resulting tarball
-tar zxf org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.tar.gz
-
-pushd eclipse
-
-# Remove the jars that we're using from other packages so that we don't
-# natively-compile them again
-rm -f plugins/org.apache.ant_1.6.2/lib/ant-antlr.jar
-rm -f plugins/org.apache.ant_1.6.2/lib/ant-apache-bcel.jar
-rm -f plugins/org.apache.ant_1.6.2/lib/ant-apache-log4j.jar
-rm -f plugins/org.apache.ant_1.6.2/lib/ant-apache-oro.jar
-rm -f plugins/org.apache.ant_1.6.2/lib/ant-apache-regexp.jar
-rm -f plugins/org.apache.ant_1.6.2/lib/ant-apache-resolver.jar
-rm -f plugins/org.apache.ant_1.6.2/lib/ant-commons-logging.jar
-rm -f plugins/org.apache.ant_1.6.2/lib/ant-jdepend.jar
-rm -f plugins/org.apache.ant_1.6.2/lib/ant-jmf.jar
-rm -f plugins/org.apache.ant_1.6.2/lib/ant-jsch.jar
-rm -f plugins/org.apache.ant_1.6.2/lib/ant-junit.jar
-rm -f plugins/org.apache.ant_1.6.2/lib/ant-launcher.jar
-rm -f plugins/org.apache.ant_1.6.2/lib/ant-nodeps.jar
-rm -f plugins/org.apache.ant_1.6.2/lib/ant-swing.jar
-rm -f plugins/org.apache.ant_1.6.2/lib/ant-trax.jar
-rm -f plugins/org.apache.ant_1.6.2/lib/ant.jar
-rm -f plugins/org.eclipse.team.cvs.ssh2_3.1.0/jsch-0.1.17.jar
-rm -f plugins/org.junit_3.8.1/junit.jar
-
-# Native build -- do -O2 on x86 and ppc only (for now)
-# see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20606, for example
-%ifarch %{ix86} ppc
-  mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
-  for j in `find -name \*.jar`; do
-      d=".%{_libdir}/%{name}/`dirname $j | sed 's:\./::'`";
-      mkdir -p $d;
-      s=`echo $j | sed "s:\./::"`;
-      gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic -O2 \
-        -o $d/`basename $j`.so $j;
-  done
-%else
-  mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
-  for j in `find -name \*.jar`; do
-      d=".%{_libdir}/%{name}/`dirname $j | sed 's:\./::'`";
-      mkdir -p $d;
-      s=`echo $j | sed "s:\./::"`;
-      gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic -O1 \
-        -o $d/`basename $j`.so $j;
-  done
-%endif
-
-# FIXME:  temporarily remove org.eclipse.osgi_3.1.0.jar
-rm \
-  .%{_libdir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}.jar.so
-# FIXME:  temporarily remove org.eclipse.ui.workbench_3.1.0.jar.so
-# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151919
-rm \
-  .%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_%{eclipse_majmin}.%{eclipse_micro}.jar.so
-
-pushd .%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0
-  gcj -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
-    -Wl,-R,%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0 \
-    jdtcore.jar.so jdtCompilerAdapter.jar.so -o ecj
-popd
-
-# Tar up the native libs
-tar czf ../%{name}-nativelycompiledjars.tar.gz .%{_libdir}/%{name}
-
-popd
-
-# Remove expanded eclipse build
-rm -rf eclipse
-popd
+  pushd result
+  # De-compress resulting tarball
+  tar zxf org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.tar.gz
+  
+  pushd eclipse
+  
+  # Remove the jars that we're using from other packages so that we don't
+  # natively-compile them again
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant-antlr.jar
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant-apache-bcel.jar
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant-apache-log4j.jar
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant-apache-oro.jar
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant-apache-regexp.jar
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant-apache-resolver.jar
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant-commons-logging.jar
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant-jdepend.jar
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant-jmf.jar
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant-jsch.jar
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant-junit.jar
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant-launcher.jar
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant-nodeps.jar
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant-swing.jar
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant-trax.jar
+  rm -f plugins/org.apache.ant_1.6.2/lib/ant.jar
+  rm -f plugins/org.eclipse.team.cvs.ssh2_3.1.0/jsch-0.1.17.jar
+  rm -f plugins/org.junit_3.8.1/junit.jar
+  
+  # Native build -- do -O2 on x86 and ppc only (for now)
+  # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20606, for example
+  %ifarch %{ix86} ppc
+    mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+    for j in `find -name \*.jar`; do
+        d=".%{_libdir}/%{name}/`dirname $j | sed 's:\./::'`";
+        mkdir -p $d;
+        gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic -O2 \
+          -o $d/`basename $j`.so $j;
+    done
+  %else
+    mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+    for j in `find -name \*.jar`; do
+        d=".%{_libdir}/%{name}/`dirname $j | sed 's:\./::'`";
+        mkdir -p $d;
+        gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic -O1 \
+          -o $d/`basename $j`.so $j;
+    done
+  %endif
+  
+  # FIXME:  temporarily remove org.eclipse.osgi_3.1.0.jar
+  # see:  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=150513
+  mv \
+    .%{_libdir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}.jar.so{,.bak}
+  # FIXME:  temporarily remove org.eclipse.ui.workbench_3.1.0.jar.so
+  # see:  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151919
+  mv \
+    .%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_%{eclipse_majmin}.%{eclipse_micro}.jar.so{,.bak}
+  # FIXME:  temporarily remove org.eclipse.jdt.ui_3.1.0/jdt_3.1.0.jar.so
+  # see:  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151296
+  mv \
+    .%{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_%{eclipse_majmin}.%{eclipse_micro}/jdt.jar.so{,.bak}
+  
+  pushd .%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0
+    gcj -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
+      -Wl,-R,%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0 \
+      jdtcore.jar.so jdtCompilerAdapter.jar.so -o ecj
+  popd
+  
+  # Tar up the native libs
+  tar czf ../%{name}-nativelycompiledjars.tar.gz .%{_libdir}/%{name}
+  
+  popd
+  
+  # Remove expanded eclipse build
+  rm -rf eclipse
+  popd
 %endif
 
 %install
@@ -598,7 +598,7 @@ popd
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 
 pushd $RPM_BUILD_ROOT%{_javadir}
-ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt.jar swt-gtk-%{version}.jar
+ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{version}.jar
 #ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-pi.jar swt-pi-gtk-%{version}.jar
 #ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-mozilla.jar swt-mozilla-%{version}.jar
 #ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-cairo.jar swt-cairo-%{version}.jar
@@ -621,13 +621,17 @@ perl -pe 's|/usr/lib/eclipse/|%{_datadir}/%{name}/|g' \
 # rh/freedesktop.org icons
 install -p -D -m0644 %{SOURCE5} \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-install -p -D -m0644 %{SOURCE4} \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -p -D -m0644 %{SOURCE3} \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 install -d -m0755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
 ln -s ../icons/hicolor/48x48/apps/%{name}.png \
   $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -d -m0755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+ln -s ../../../../%{name}/plugins/org.eclipse.platform_%{eclipse_majmin}.%{eclipse_micro}/eclipse32.gif \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -d -m0755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
+ln -s ../../../../%{name}/plugins/org.eclipse.platform_%{eclipse_majmin}.%{eclipse_micro}/eclipse.gif \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+# Remove unused icon.xpm
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/icon.xpm
 
 # install the efj wrapper script and change the Eclipse installation dir
 install -p -D -m0755 %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/efj
@@ -854,27 +858,31 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache %{_datadir}/icons/hicolor
 fi
 
-# FIXME:  add the native directories to these lists
 %files ecj
-%defattr(0644,root,root,0755)
 %dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/plugins
+%dir %{_datadir}/%{name}/features
+%dir %{_datadir}/%{name}/configuration
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.*
 %{_datadir}/java/jdtcore*.jar
 %if %{gcj_support}
 # Native bits
 %{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-ecj.db
+%dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0/jdtcore.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0/jdtCompilerAdapter.jar.so
-%attr(0755,root,root) %{_bindir}/ecj
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0
+%{_bindir}/ecj
 %endif
 
 %files -n %{libname}-gtk2 -f %{libname}-gtk2.install
-%defattr(0644,root,root,0755)
-#%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-atk-gtk-*.so
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/plugins
+%dir %{_datadir}/%{name}/features
+%dir %{_datadir}/%{name}/configuration
+#%{_libdir}/%{name}/libswt-gnome-gtk-*.so
+#%{_libdir}/%{name}/libswt-gtk-*.so
+#%{_libdir}/%{name}/libswt-pi-gtk-*.so
+#%{_libdir}/%{name}/libswt-atk-gtk-*.so
 #%{_libdir}/%{name}/libswt-awt-gtk-*.so
 #%{_libdir}/%{name}/libswt-mozilla-gtk-*.so
 #%{_libdir}/libswt-*.so
@@ -885,35 +893,31 @@ fi
 %if %{gcj_support}
 # Native bits
 %{_libdir}/gcj-4.0.0/classmap.db.d/libswt3-gtk2.db
+%dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.swt_3.1.0.jar.so
 %ifarch alpha ia64 ppc64 sparc64 x86_64
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0.jar.so
 %else
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0.jar.so
 %endif
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jface_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jface.text_3.1.0/jfacetext.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.jface_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.jface.text_3.1.0
 %endif
 
 %files jdt -f %{name}-jdt.install
-%defattr(0644,root,root,0755)
-%attr(0755,root,root) %{_bindir}/efj
+%{_bindir}/efj
 %if %{gcj_support}
 # Native bits
 %{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-jdt.db
-%dir %{_libdir}/%{name}/plugins
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_3.1.0/jdiui.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_3.1.0/snippetsupport.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_3.1.0/jdimodel.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_3.1.0/jdi.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.junit_3.1.0/junitsupport.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_3.1.0/junitruntime.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_3.1.0/launching.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_3.1.0/lib/launchingsupport.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_3.1.0/jdt.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_3.1.0/serialsupport.jar.so
-#%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.junit_3.8.1/junit.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_3.1.0
+%dir %{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_3.1.0
+#%{_libdir}/%{name}/plugins/org.junit_3.8.1/junit.jar.so
 %endif
 
 %files jdt-devel
@@ -921,20 +925,15 @@ fi
 %{_datadir}/%{name}/features/org.eclipse.jdt.source_3.*
 
 %files pde -f %{name}-pde.install
-%defattr(0644,root,root,0755)
 %if %{gcj_support}
 # Native bits
 %{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-pde.db
-%dir %{_libdir}/%{name}/plugins
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde.build_3.1.0/lib/pdebuild-ant.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde.build_3.1.0/pdebuild.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde.core_3.1.0/pdecore.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde.junit.runtime_3.1.0/pdejunit.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_3.1.0/pdert.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde.ui_3.1.0/pdeuiant.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde.ui_3.1.0/pdeui.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde_3.1.0/pde.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde_3.1.0/ant_tasks/pde-ant.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.pde.build_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.pde.core_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.pde.junit.runtime_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.pde.ui_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.pde_3.1.0
 %endif
 
 %files pde-devel
@@ -942,18 +941,14 @@ fi
 %{_datadir}/%{name}/features/org.eclipse.pde.source_3.*
 
 %files platform -f %{name}-platform.install
-%defattr(0644,root,root,0755)
-%dir %{_datadir}/%{name}
-%dir %{_libdir}/%{name}
 %{_datadir}/%{name}/.eclipseproduct
 %{_datadir}/%{name}/startup.jar
-%{_datadir}/%{name}/icon.xpm
-%attr(0755,root,root) %{_datadir}/%{name}/buildscripts/copy-platform
-%attr(0755,root,root) %{_libdir}/%{name}/eclipse
-#%attr(0755,root,root) %{_libdir}/%{name}/libcore*
-#%attr(0755,root,root) %{_libdir}/%{name}/libupdate*
+%{_datadir}/%{name}/buildscripts
+%{_libdir}/%{name}/eclipse
+#%{_libdir}/%{name}/libcore*
+#%{_libdir}/%{name}/libupdate*
 %{_datadir}/%{name}/eclipse
-%attr(0755,root,root) %{_bindir}/eclipse
+%{_bindir}/eclipse
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/*/*/apps/*
@@ -961,107 +956,64 @@ fi
 %if %{gcj_support}
 # Native bits
 %{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-platform.db
-%dir %{_libdir}/%{name}/plugins
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ant.core_3.1.0/antsupport.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.compare_3.1.0/compare.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.boot_3.0.0/boot.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.expressions_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_3.1.0/filebuffers.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.resources_3.1.0/resources.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.commands_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.resources_3.1.0/ant_tasks/resources-ant.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.runtime_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.variables_3.1.0/variables.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.debug.core_3.1.0/dtcore.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.debug.ui_3.1.0/dtui.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.base_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.ui_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.appserver_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_3.1.0/refcore.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_3.1.0/refui.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi.services_3.0.0/services.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi.util_3.0.0/util.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_3.1.0/activeHelpSample.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.platform_3.1.0/platform.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.search_3.1.0/search.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.core_3.1.0/team.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_3.1.0/cvs.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ui_3.1.0/teamcvsui.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh_3.1.0/teamcvsssh.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0/jsch-0.1.16.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0/jsch-0.1.18.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.ui_3.1.0/teamui.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.text_3.1.0/text.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.browser_3.1.0/browser.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.cheatsheets_3.0.0/cheatsheets.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.externaltools_3.1.0/externaltools.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.forms_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.ide_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.intro_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui_3.1.0.jar.so
-#%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_3.1.0/compatibility.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_3.1.0/compatibility.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_3.1.0/compatibility.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_3.1.0/texteditor.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.editors_3.1.0/editors.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.presentations.r21_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.views_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.core_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.ui_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/startup.jar.so
-# FIXME where should these go?
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.lucene_1.4.3/parser.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.lucene_1.4.3/lucene-1.4.3.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ant.ui_3.1.0/antui.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ant.ui_3.1.0/lib/remoteAnt.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ant.ui_3.1.0/lib/antrunner.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ant.core_3.1.0/lib/antsupportlib.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-digester.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-logging.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/jakarta-regexp-1.3.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/tomcat-util.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/servlets-manager.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/naming-common.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/naming-factory.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-beanutils.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/servlets-default.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-modeler.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/tomcat-coyote.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/jasper-compiler.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/catalina.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/jasper-runtime.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-logging-api.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/servlets-invoker.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/tomcatwrapper.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/mx4j-jmx.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/bootstrap.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/servlet.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-collections.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/servlets-common.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/naming-resources.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/tomcat-http11.jar.so
-#%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0/cvsssh2.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-stylebook.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-javamail.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-weblogic.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-netrexx.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-commons-net.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-icontract.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-vaj.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-apache-bsf.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-xslp.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-xalan1.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-jai.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-starteam.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.1.0/webapp.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.1.0/WEB-INF/lib/jsp.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.1.0/WEB-INF/lib/servlets.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.console_3.1.0/console.jar.so
+%{_libdir}/%{name}/startup.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.core.commands_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.core.expressions_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.core.runtime_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.help.base_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.help.ui_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.help.appserver_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.help_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.ui.forms_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.ui.ide_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.ui.intro_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.ui_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_3.1.0.jar.so.bak
+%{_libdir}/%{name}/plugins/org.eclipse.ui.presentations.r21_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.ui.views_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.update.configurator_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.update.core_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.update.ui_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0.jar.so.bak
+%{_libdir}/%{name}/plugins/org.eclipse.ant.core_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.compare_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.core.boot_3.0.0
+%{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.core.resources_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.core.variables_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.debug.core_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.debug.ui_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_3.0.0
+%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_3.0.0
+%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.platform_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.search_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.team.core_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ui_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.team.ui_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.text_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.ui.browser_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.ui.cheatsheets_3.0.0
+%{_libdir}/%{name}/plugins/org.eclipse.ui.externaltools_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.ui.editors_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.ant.ui_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.1.0
+%{_libdir}/%{name}/plugins/org.eclipse.ui.console_3.1.0
+# FIXME build packages for these so we don't have their jars and jar.sos in
+# eclipse-platform
+%{_libdir}/%{name}/plugins/org.apache.lucene_1.4.3
+%{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1
+%{_libdir}/%{name}/plugins/org.apache.ant_1.6.2
 %endif
 
 %files platform-devel
@@ -1070,13 +1022,20 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
+* Thu Apr 21 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M6.9
+- Use upstream icons (not RHDS ones) (rh#146484).
+- Add plugin directories to %files sections.
+- Rework %files sections a bit.
+- Fix SWT symlink (bkonrath).
+- Temporarily remove jdt.ui/jdt.jar.so.
+
 * Thu Apr 21 2005 Ben Konrath <bkonrath@redhat.com> 3.1.0_fc-0.M6.8
 - Fix updatesite patch.
 - Temporarily remove org.eclipse.ui.workbench_3.1.0.jar.so (r.c#151919)
 
 * Mon Apr 18 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M6.7
-- Add %if %{gcj_support} blocks.
-- Add %{_libdir}/%{name}/plugins to native %files section of each sub-rpm.
+- Add %if %%{gcj_support} blocks.
+- Add %%{_libdir}/%%{name}/plugins to native %files section of each sub-rpm.
 - Add GNU-style JDT code formatting option (e.o#91770).
 - Add patch to install plugins from update site in home dir (e.o#90630).
 - Change gcc-java requirements to libgcj as gcj-dbtool is now in the latter.