diff --git a/.cvsignore b/.cvsignore
index e9f2865..da8cf47 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-eclipse-sourceBuild-srcIncluded-3.1.1.zip
-eclipse-fedora-splash-3.1.1.png
+eclipse-sourceBuild-srcIncluded-3.1.2.zip
+eclipse-fedora-splash-3.1.2.png
diff --git a/eclipse-usebuiltlauncher.patch b/eclipse-usebuiltlauncher.patch
deleted file mode 100644
index 5871157..0000000
--- a/eclipse-usebuiltlauncher.patch
+++ /dev/null
@@ -1,149 +0,0 @@
---- features/org.eclipse.platform/build.xml 2005-10-28 12:24:11.000000000 -0400
-+++ features/org.eclipse.platform/build.xml 2005-10-28 12:25:22.000000000 -0400
-@@ -349,6 +349,11 @@
-
-
-
-+
-+
-+
-+
-+
-
-
-
-@@ -357,6 +362,8 @@
-
-
-
-+
-+
-
-
-
-@@ -368,6 +375,8 @@
-
-
-
-+
-+
-
-
-
-@@ -379,6 +388,8 @@
-
-
-
-+
-+
-
-
-
-@@ -389,6 +400,8 @@
-
-
-
-+
-+
-
-
-
-@@ -400,6 +413,8 @@
-
-
-
-+
-+
-
-
-
-@@ -411,6 +426,8 @@
-
-
-
-+
-+
-
-
-
-@@ -424,6 +441,8 @@
-
-
-
-+
-+
-
-
-
-@@ -435,6 +454,8 @@
-
-
-
-+
-+
-
-
-
-@@ -445,6 +466,8 @@
-
-
-
-+
-+
-
-
-
-@@ -455,6 +478,8 @@
-
-
-
-+
-+
-
-
-
-@@ -465,6 +490,8 @@
-
-
-
-+
-+
-
-
-
-@@ -475,6 +502,8 @@
-
-
-
-+
-+
-
-
-
-@@ -485,6 +514,8 @@
-
-
-
-+
-+
-
-
-
-@@ -495,6 +526,8 @@
-
-
-
-+
-+
-
-
-
-@@ -511,6 +544,8 @@
-
-
-
-+
-+
-
-
-
diff --git a/eclipse.spec b/eclipse.spec
index 02f9ca7..37f1340 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -9,9 +9,8 @@ Epoch: 1
%define eclipse_major 3
%define eclipse_minor 1
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro 1
+%define eclipse_micro 2
%define libname libswt3
-%define build_id M20050929-0840
# All arches line up except i386 -> x86
%ifarch %{ix86}
@@ -23,11 +22,11 @@ Epoch: 1
Summary: %{pkg_summary}
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 1jpp_16fc
+Release: 1jpp_1fc
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
-Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-sourceBuild-srcIncluded-3.1.1.zip
+Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-sourceBuild-srcIncluded-3.1.2.zip
Source2: %{name}.desktop
Source5: %{name}-48.png
Source6: %{name}.conf
@@ -35,7 +34,7 @@ Source7: %{name}-jdt.install
Source8: %{name}-pde.install
Source9: %{name}-platform.install
Source10: %{libname}-gtk2.install
-Source11: %{name}-fedora-splash-3.1.1.png
+Source11: %{name}-fedora-splash-3.1.2.png
Source16: %{name}-copy-platform.sh
Source17: %{name}-efj-wrapper.sh
Source19: %{name}-filenamepatterns.txt
@@ -62,9 +61,6 @@ Patch11: %{name}-libswt-mozilla.patch
Patch13: %{name}-s390ands390x.patch
# Stupid spaces in directories ...
Patch14: %{name}-s390ands390x2.patch
-# Make find work. See
-# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=111736
-#Patch16: %{name}-find.patch
# Build swttools.jar
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
Patch18: %{name}-swttools.patch
@@ -97,9 +93,6 @@ Patch36: %{name}-ecj-classpath.patch
Patch37: %{name}-gre64.conf.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001
Patch38: %{name}-helpindexbuilder.patch
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=111299
-Patch39: %{name}-e.o111299.patch
-Patch40: %{name}-usebuiltlauncher.patch
# Build cairo libs
# Again, I hate patches with spaces in the filenames
Patch41: %{name}-libswt-cairo1.0-1.patch
@@ -328,17 +321,14 @@ pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
%patch0 -p0
%patch11 -p0
%if %{gcj_support}
-%patch14 -p0
+#%patch14 -p0
%endif
popd
%patch2 -p0
%patch4 -p0
%patch5 -p0
%if %{gcj_support}
-%patch13 -p0
-%endif
-%if %{gcj_support}
-#%patch16 -p0
+#%patch13 -p0
%endif
pushd plugins/org.eclipse.swt.gtk.linux.x86_64
%patch18 -p0
@@ -384,10 +374,6 @@ popd
%patch35 -p0
%patch36 -p1
%patch38 -p0
-pushd plugins
-%patch39 -p0
-popd
-%patch40 -p0
# Again, I hate spaces in patches
pushd plugins/org.eclipse.swt/Eclipse\ SWT/
%patch41 -p0
@@ -1032,8 +1018,8 @@ fi
%if %{gcj_support}
# Native bits
%dir %{_libdir}/gcj/%{name}
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.db
%{_bindir}/ecj
%endif
@@ -1054,8 +1040,8 @@ fi
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/org.eclipse.jface_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.jface_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.1.jar.so
%endif
@@ -1064,12 +1050,12 @@ fi
%{_bindir}/efj
%if %{gcj_support}
# Native bits
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.2.jar.so
%{_libdir}/gcj/%{name}/junitruntime.jar.db
%{_libdir}/gcj/%{name}/junitruntime.jar.so
%{_libdir}/gcj/%{name}/junitsupport.jar.db
@@ -1097,8 +1083,8 @@ fi
%{_libdir}/gcj/%{name}/org.eclipse.pde.core_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.2.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.pde_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.pde_3.1.0.jar.db
%endif
@@ -1153,14 +1139,14 @@ fi
%{_libdir}/gcj/%{name}/org.eclipse.core.commands_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.core.expressions_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.core.expressions_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.0.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.core.variables_3.1.0.jar.db
@@ -1181,14 +1167,14 @@ fi
%{_libdir}/gcj/%{name}/webapp.jar.so
%{_libdir}/gcj/%{name}/tomcatwrapper.jar.db
%{_libdir}/gcj/%{name}/tomcatwrapper.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.browser_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.browser_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.0.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.editors_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.editors_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_3.1.1.jar.db
@@ -1203,36 +1189,36 @@ fi
%{_libdir}/gcj/%{name}/org.eclipse.ui.presentations.r21_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.views_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.views_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.2.jar.so
%{_libdir}/gcj/%{name}/compatibility.jar.db
%{_libdir}/gcj/%{name}/compatibility.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.update.configurator_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.update.configurator_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.update.ui_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.update.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.osgi.util_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.osgi.util_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ant.core_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ant.core_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.compare_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.compare_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.2.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ltk.core.refactoring_3.1.0.jar.so
@@ -1253,8 +1239,8 @@ fi
%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.team.ui_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.team.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.2.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.text_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.text_3.1.1.jar.db
%endif
@@ -1262,9 +1248,13 @@ fi
%files platform-devel
%{_datadir}/%{name}/plugins/org.eclipse.platform.source_3.*
%{_datadir}/%{name}/features/org.eclipse.platform.source_3.*
-%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
+%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
%changelog
+* Tue Jan 31 2006 Andrew Overholt 3.1.2-1jpp_1fc
+- 3.1.2.
+- Remove unnecessary patches.
+
* Tue Jan 31 2006 Karsten Hopp
- BuildRequire: unzip
diff --git a/sources b/sources
index 36cf3ca..aeef51d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0d78d5f8afe767014a1cc69ee8c20869 eclipse-sourceBuild-srcIncluded-3.1.1.zip
-0c2a9c7c9f8c6cd1e7264dd0be801d66 eclipse-fedora-splash-3.1.1.png
+f2c8066151de14c5ccdf420266ce9f39 eclipse-sourceBuild-srcIncluded-3.1.2.zip
+1ee1e19362e3ee4d3b67a6dea18961de eclipse-fedora-splash-3.1.2.png