From e29c035de28c4af912da5587714c42aba3242ae4 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Aug 13 2008 20:14:30 +0000
Subject: - Fix ecj-gcj (rhbz#458921)


---

diff --git a/eclipse.spec b/eclipse.spec
index 9ebe5f8..76d1e8a 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -23,7 +23,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        20%{?dist} 
+Release:        21%{?dist} 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -70,7 +70,7 @@ Source27:       ecf-filetransfer-build.properties
 Source28:       %{name}-mv-Platform.sh
 # Use ECJ for GCJ
 # cvs -d:pserver:anonymous@sourceware.org:/cvs/rhug \
-# export -r eclipse_r34 eclipse-gcj
+# export -r eclipse_r34_1 eclipse-gcj
 # tar cjf eclipse-ecj-gcj.tar.bz2 eclipse-gcj
 Source29:       %{name}-ecj-gcj.tar.bz2
 
@@ -292,11 +292,11 @@ sed --in-place "s/java5.home/java.home/" build.xml
 %patch32 -p0
 
 # Use ECJ for GCJ's bytecode compiler
-tar jxf %{SOURCE29}
+tar zxf %{SOURCE29}
 mv eclipse-gcj/org/eclipse/jdt/internal/compiler/batch/GCCMain.java \
   plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/
-mv eclipse-gcj/gcc.properties \
-  plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/
+cat eclipse-gcj/gcc.properties >> \
+  plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
 rm -rf eclipse-gcj
 
 # liblocalfile fixes
@@ -1458,6 +1458,9 @@ fi
 %{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Aug 13 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-21
+- Fix ecj-gcj (rhbz#458921)
+
 * Tue Aug 12 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-20
 - Require release of jetty which requires tomcat bits with proper metadata
 - Fix pdebuild for moved JDT and PDE plugins (Alexander Kurtakov)
diff --git a/sources b/sources
index 7755ccb..0fb8b0d 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,5 @@ e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
 28c8d625ea1af348cfc592369d52284c  org.fedoraproject.ide.feature-1.0.0.zip
 611d3dc63e9e4246e325848d32773132  ecf-filetransfer-v20080611-1715.tar.bz2
 555c99aee06fc52d2ec03995b5ac0710  eclipse-sourceBuild-srcIncluded-3.4.zip
-485f281cd968bf30d5266dc254004b1e  eclipse-ecj-gcj.tar.bz2
 372361ae6f1355ec5cfb9a301ad690f5  org.fedoraproject.ide.platform-3.4.0-1.zip
+43c2aa722a815c61706549d28786d134  eclipse-ecj-gcj.tar.bz2