rpms/eclipse/devel eclipse-ecj-gcj.patch, 1.9, 1.10 eclipse.spec, 1.540, 1.541

Andrew Overholt (overholt) fedora-extras-commits at redhat.com
Fri Jul 18 16:47:57 UTC 2008


Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12064

Modified Files:
	eclipse-ecj-gcj.patch eclipse.spec 
Log Message:
* Fri Jul 18 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-4
- Re-add updated use-ecj-for-gcj patch

eclipse-ecj-gcj.patch:

Index: eclipse-ecj-gcj.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-ecj-gcj.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- eclipse-ecj-gcj.patch	31 Jul 2007 23:02:58 -0000	1.9
+++ eclipse-ecj-gcj.patch	18 Jul 2008 16:47:12 -0000	1.10
@@ -5,10 +5,10 @@
 diff -u -r1.546.2.23 messages.properties
 --- batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	8 Feb 2007 15:04:43 -0000	1.546.2.23
 +++ batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	26 Feb 2007 18:21:06 -0000
-@@ -249,3 +249,8 @@
- template.restrictedAccess.constructor = The constructor {0} is not accessible due to restriction on classpath entry {1}
- template.restrictedAccess.field = The field {0} from the type {1} is not accessible due to restriction on classpath entry {2}
- template.restrictedAccess.method = The method {0} from the type {1} is not accessible due to restriction on classpath entry {2}
+@@ -298,3 +298,8 @@ misc.usage.warn = {1} {2}\n\
+ \ \n\
+ \ Advanced options:\n\
+ \    -? -help           print the help message\n
 +
 +# GCCMain messages.
 +gcc.zipArg=-fzip-target requires argument


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.540
retrieving revision 1.541
diff -u -r1.540 -r1.541
--- eclipse.spec	18 Jul 2008 16:28:23 -0000	1.540
+++ eclipse.spec	18 Jul 2008 16:47:12 -0000	1.541
@@ -89,7 +89,7 @@
 # https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
 Patch15:        %{name}-pde.build-add-package-build.patch
 # Use ecj for gcj
-#Patch17:        %{name}-ecj-gcj.patch
+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
@@ -309,10 +309,9 @@
 %patch4 -p0
 popd
 
-## FIXME:  update
-#pushd plugins/org.eclipse.jdt.core
-#%patch17 -p0
-#popd
+pushd plugins/org.eclipse.jdt.core
+%patch17 -p0
+popd
 
 # liblocalfile fixes
 sed --in-place "s/JAVA_HOME =/#JAVA_HOME =/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
@@ -1340,6 +1339,7 @@
 - Un-do crazy config.ini, bundles.info, etc. shuffling
 - Update patch for building native libraries
 - Re-add missing BR on tomcat5-jasper-eclipse
+- Re-add updated use-ecj-for-gcj patch
 
 * Thu Jul 17 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-3
 - Generate metadata and provision each sub-package




More information about the scm-commits mailing list