- Use ecj from 3.1.1 (rh#175380).

- Remove ecj options patch as it is in ecj from 3.1.1.
- New version of launcher patch (rh#175454) - ifoox.

.cvsignore

@@ -1,3 +1,2 @@
 eclipse-sourceBuild-srcIncluded-3.1.1.zip
-ecj-M5.zip
 eclipse-fedora-splash-3.1.1.png

eclipse.spec

@@ -82,8 +82,6 @@ Patch22: 	%{name}-updatehomedir-core.patch
 Patch23: 	%{name}-updatehomedir-ui.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
 Patch24: 	%{name}-fileinitializer.patch
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=88364
-Patch26: 	%{name}-ecj-options.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371
 Patch28: 	%{name}-tomcat5.patch
 Patch29: 	%{name}-tomcat5-build.patch
@@ -428,20 +426,6 @@ popd
   pushd plugins/org.eclipse.platform
   cp %{SOURCE11} splash.bmp
   popd
-
-  # use M5 ecj rather than the one included
-  cp %{SOURCE18} jdtcoresrc/src/ecj.zip
-
-  # we need to add the ecj-options patch to the bootstrap compiler
-  pushd jdtcoresrc/src
-  unzip ecj.zip
-  mv ecj.zip{,.orig}
-  dos2unix org/eclipse/jdt/internal/compiler/batch/Main.java
-  dos2unix org/eclipse/jdt/internal/compiler/batch/messages.properties
-%patch26 -p1
-  zip -9 -r ecj.zip *
-  rm -r org
-  popd
 %endif
 
 # Remove existing .sos
@@ -1284,6 +1268,11 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
 
 %changelog
+* Mon Dec 12 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_1fc.FC4.9
+- Use ecj from 3.1.1 (rh#175380).
+- Remove ecj options patch as it is in ecj from 3.1.1.
+- New version of launcher patch (rh#175454) - ifoox.
+
 * Sun Dec 11 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_10fc
 - Build with gcc 4.1.
 

sources

@@ -1,3 +1,2 @@
 0d78d5f8afe767014a1cc69ee8c20869  eclipse-sourceBuild-srcIncluded-3.1.1.zip
-60f8146948470d0ef7c275f26b874a31  ecj-M5.zip
 0c2a9c7c9f8c6cd1e7264dd0be801d66  eclipse-fedora-splash-3.1.1.png