diff --git a/.cvsignore b/.cvsignore
index 9cf874f..c92210e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
eclipse-fileinitializerapp.tar.bz2
org.fedoraproject.ide.feature-1.0.0.zip
-eclipse-sourceBuild-srcIncluded-3.3.1.1.zip
-org.fedoraproject.ide.platform-3.3.1.1-3.zip
+eclipse-sourceBuild-srcIncluded-3.3.2.zip
+org.fedoraproject.ide.platform-3.3.2.zip
diff --git a/eclipse-add-ppc64-sparc64-s390-s390x-2.patch b/eclipse-add-ppc64-sparc64-s390-s390x-2.patch
index 9e85292..471b8df 100644
--- a/eclipse-add-ppc64-sparc64-s390-s390x-2.patch
+++ b/eclipse-add-ppc64-sparc64-s390-s390x-2.patch
@@ -1,17 +1,17 @@
-diff -uNr features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml
---- features/org.eclipse.platform.source/feature.xml 2007-10-31 11:14:44.000000000 -0400
-+++ features/org.eclipse.platform.source/feature.xml 2007-10-31 11:16:06.000000000 -0400
+diff -ur features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml
+--- features/org.eclipse.platform.source/feature.xml 2008-04-03 11:07:23.000000000 -0400
++++ features/org.eclipse.platform.source/feature.xml 2008-04-03 11:13:00.000000000 -0400
@@ -42,4 +42,7 @@
-
-
-
-+
-+
-+
+
+
+
++
++
++
-diff -uNr features/org.eclipse.rcp/feature.xml features/org.eclipse.rcp/feature.xml
---- features/org.eclipse.rcp/feature.xml 2007-10-31 11:18:13.000000000 -0400
-+++ features/org.eclipse.rcp/feature.xml 2007-10-31 11:14:44.000000000 -0400
+diff -ur features/org.eclipse.rcp/feature.xml features/org.eclipse.rcp/feature.xml
+--- features/org.eclipse.rcp/feature.xml 2008-04-03 11:16:49.000000000 -0400
++++ features/org.eclipse.rcp/feature.xml 2008-04-03 11:07:23.000000000 -0400
@@ -499,4 +499,48 @@
version="0.0.0"
fragment="true"/>
@@ -61,15 +61,15 @@ diff -uNr features/org.eclipse.rcp/feature.xml features/org.eclipse.rcp/feature.
+ unpack="false"/>
+
-diff -uNr features/org.eclipse.rcp.source/feature.xml features/org.eclipse.rcp.source/feature.xml
---- features/org.eclipse.rcp.source/feature.xml 2007-10-31 11:14:44.000000000 -0400
-+++ features/org.eclipse.rcp.source/feature.xml 2007-10-31 11:17:45.000000000 -0400
+diff -ur features/org.eclipse.rcp.source/feature.xml features/org.eclipse.rcp.source/feature.xml
+--- features/org.eclipse.rcp.source/feature.xml 2008-04-03 11:07:23.000000000 -0400
++++ features/org.eclipse.rcp.source/feature.xml 2008-04-03 11:17:54.000000000 -0400
@@ -30,4 +30,8 @@
-
-
-
-+
-+
-+
-+
+
+
+
++
++
++
++
diff --git a/eclipse-addfragmentsforotherplatforms.patch b/eclipse-addfragmentsforotherplatforms.patch
index 75f0bea..022baf7 100644
--- a/eclipse-addfragmentsforotherplatforms.patch
+++ b/eclipse-addfragmentsforotherplatforms.patch
@@ -1,26 +1,19 @@
---- assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2007-11-21 13:50:10.000000000 -0500
-+++ assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2007-11-21 13:51:56.000000000 -0500
-@@ -122,6 +122,9 @@
+--- assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2008-04-03 11:20:05.000000000 -0400
++++ assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2008-04-03 11:24:25.000000000 -0400
+@@ -299,6 +299,12 @@
+
+
+
-
-
-
-@@ -281,6 +284,9 @@
-
-
-
+
+
+
-
+
-@@ -732,6 +738,10 @@
+@@ -812,6 +818,10 @@
@@ -28,6 +21,6 @@
+
+
+
-
+
diff --git a/eclipse.spec b/eclipse.spec
index be4f851..be5a8ea 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -6,7 +6,7 @@ Epoch: 1
%define eclipse_major 3
%define eclipse_minor 3
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro 1.1
+%define eclipse_micro 2
%define libname libswt3
# All arches line up between Eclipse and Linux kernel names except i386 -> x86
@@ -19,19 +19,19 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 18%{?dist}
+Release: 1%{?dist}
License: Eclipse Public License
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
-Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.3.1.1-200710231652/eclipse-sourceBuild-srcIncluded-3.3.1.1.zip
+Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.3.2-200802211800/eclipse-sourceBuild-srcIncluded-3.3.2.zip
Source2: %{name}.desktop
Source3: eclipse.in
# cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \
-# -r fedoraeclipse-3_3_1_1-3 branding/org.fedoraproject.ide.platform
+# -r fedoraeclipse-3_3_2 branding/org.fedoraproject.ide.platform
# cd branding
-# zip -r org.fedoraproject.ide.platform-3.3.1.1-3.zip \
+# zip -r org.fedoraproject.ide.platform-3.3.2.zip \
# org.fedoraproject.ide.platform
-Source4: org.fedoraproject.ide.platform-%{version}-3.zip
+Source4: org.fedoraproject.ide.platform-%{version}.zip
# cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \
# -r fedoraeclipsefeature-1_0_0 branding/org.fedoraproject.ide-feature
# cd branding
@@ -78,8 +78,6 @@ Patch17: %{name}-ecj-gcj.patch
Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch
Patch28: %{name}-add-ppc64-sparc64-s390-s390x-2.patch
Patch30: %{name}-addfragmentsforotherplatforms.patch
-#https://bugs.eclipse.org/bugs/show_bug.cgi?id=198840
-Patch25: %{name}-launcher-double-free-bug.patch
#FIXME: file a bug upstream
Patch26: %{name}-launcher-fix-java-home.patch
# On a 1.7 VM, generate 1.6-level bytecode
@@ -153,8 +151,8 @@ JavaBeans(tm).
%package ecj
Summary: Eclipse Compiler for Java
Group: Development/Languages
-Obsoletes: ecj <= 2.1.3
-Provides: ecj <= 2.1.3
+Obsoletes: ecj < %{version}-%{release}
+Provides: ecj <= %{version}-%{release}
%if %{gcj_support}
Requires: libgcj >= 4.0.2
Requires(post): java-gcj-compat >= 1.0.64
@@ -364,7 +362,6 @@ sed --in-place "s/OPT_FLAGS=-O/OPT_FLAGS=-O2 -g/" plugins/org.eclipse.core.files
rm plugins/org.eclipse.platform/launchersrc.zip
pushd features/org.eclipse.equinox.executable
%patch12 -p0
-%patch25 -p0
%patch26 -p0
# put the configuration directory in an arch-specific location
sed --in-place "s:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:" library/eclipse.c
@@ -717,7 +714,6 @@ ant \
-Dnobootstrap=true \
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
-Dlibsconfig=true -DjavacSource=1.5 -DjavacTarget=1.5 -DcompilerArg="-encoding ISO-8859-1 -nowarn"
-
# build 1.6 when building with IcedTea
SDK=$(cd eclipse && pwd)
@@ -941,8 +937,18 @@ popd
# Install the eclipse-ecj.jar symlink for java-1.4.2-gcj-compat's "javac"
JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//")
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj.jar
-ln -s %{_javadir}/eclipse-ecj.jar $RPM_BUILD_ROOT%{_javadir}/jdtcore.jar
+ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX \
+ $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj-%{version}.jar
+ln -s %{_javadir}/eclipse-ecj-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj.jar
+ln -s %{_javadir}/eclipse-ecj-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/jdtcore-%{version}.jar
+ln -s %{_javadir}/jdtcore-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/jdtcore.jar
+ln -s %{_javadir}/eclipse-ecj-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/ecj-%{version}.jar
+ln -s %{_javadir}/ecj-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/ecj.jar
# FIXME: get rid of this by putting logic in package build to know what version
# of pde.build it's using
@@ -1284,8 +1290,9 @@ fi
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/plugins
%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_*
-%{_javadir}/eclipse-ecj.jar
-%{_javadir}/jdtcore.jar
+%{_javadir}/eclipse-ecj*.jar
+%{_javadir}/jdtcore*.jar
+%{_javadir}/ecj*.jar
%{_bindir}/ecj
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
@@ -1631,6 +1638,11 @@ fi
%endif
%changelog
+* Thu Apr 03 2008 Andrew Overholt 3.3.2-1
+- 3.3.2
+- Update Obsoletes/Provides for ecj and make more ecj symlinks
+ (rhbz#439825).
+
* Mon Mar 31 2008 Andrew Overholt 3.3.1.1-18
- Add PDE Build wrapper script (%%{_datadir}/eclipse/pdebuild) for
packaging guidelines.
diff --git a/sources b/sources
index e133e4c..39b249a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2
28c8d625ea1af348cfc592369d52284c org.fedoraproject.ide.feature-1.0.0.zip
-593b56fce7d1f1f799e87365cafefbef eclipse-sourceBuild-srcIncluded-3.3.1.1.zip
-fbb918b95640b17d7225eddbd75564f0 org.fedoraproject.ide.platform-3.3.1.1-3.zip
+4b7016cf9aedf07b8f34b39470947799 eclipse-sourceBuild-srcIncluded-3.3.2.zip
+08529425250f218c59acd622728b9b44 org.fedoraproject.ide.platform-3.3.2.zip