rpms/eclipse/devel eclipse-bootstrap.patch, 1.1, 1.2 eclipse.spec, 1.101, 1.102

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10144

Modified Files:
	eclipse-bootstrap.patch eclipse.spec 
Log Message:
- Fix the bootstrap patch (the ecj jar was missing some files).


eclipse-bootstrap.patch:
 build                                  |   10 ++++-
 build.xml                              |   19 ++++++-----
 jdtcoresrc/compilejdtcore.xml          |   56 +++++++++++++++++++++++++++++++++
 jdtcoresrc/compilejdtcorewithjavac.xml |   51 ++++++++++++++++++++++++++++++
 4 files changed, 125 insertions(+), 11 deletions(-)

Index: eclipse-bootstrap.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-bootstrap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-bootstrap.patch	22 Mar 2005 23:17:45 -0000	1.1
+++ eclipse-bootstrap.patch	14 Apr 2005 01:52:09 -0000	1.2
@@ -1,6 +1,6 @@
-diff -uNr eclipse-3.1.0_fc/build eclipse-3.1.0_fc.withbootstrap/build
---- eclipse-3.1.0_fc/build	2005-03-11 15:27:10.030847169 -0500
-+++ eclipse-3.1.0_fc.withbootstrap/build	2005-03-11 15:29:01.897961043 -0500
+diff -ruN eclipse-3.1.0_fc/build eclipse-3.1.0_fc.withbootstrap/build
+--- eclipse-3.1.0_fc/build	2005-04-13 21:33:21.486862784 -0400
++++ eclipse-3.1.0_fc.withbootstrap/build	2005-04-13 18:39:04.000000000 -0400
 @@ -1,4 +1,4 @@
 -#! /bin/sh
 +#!/bin/sh
@@ -29,9 +29,9 @@
  else
  	echo "The os-ws-arch combination of $os-$ws-$arch is not valid."
  	exit 1
-diff -uNr eclipse-3.1.0_fc/build.xml eclipse-3.1.0_fc.withbootstrap/build.xml
---- eclipse-3.1.0_fc/build.xml	2005-03-11 15:27:10.030847169 -0500
-+++ eclipse-3.1.0_fc.withbootstrap/build.xml	2005-03-11 15:29:59.304782783 -0500
+diff -ruN eclipse-3.1.0_fc/build.xml eclipse-3.1.0_fc.withbootstrap/build.xml
+--- eclipse-3.1.0_fc/build.xml	2005-04-13 21:33:21.486862784 -0400
++++ eclipse-3.1.0_fc.withbootstrap/build.xml	2005-04-13 18:39:04.000000000 -0400
 @@ -184,15 +184,16 @@
  		<!--set the compiler and compiler arguments-->
  		<!--the default compiler is set to the one used by eclipse rel. eng. -->
@@ -64,10 +64,10 @@
 +	<!-- temporary fix until https://bugs.eclipse.org/bugs/show_bug.cgi?id=86571 is fixed -->
 +	<property name="tarargs" value=""/>
  </project>
-diff -uNr eclipse-3.1.0_fc/jdtcoresrc/compilejdtcorewithjavac.xml eclipse-3.1.0_fc.withbootstrap/jdtcoresrc/compilejdtcorewithjavac.xml
+diff -ruN eclipse-3.1.0_fc/jdtcoresrc/compilejdtcorewithjavac.xml eclipse-3.1.0_fc.withbootstrap/jdtcoresrc/compilejdtcorewithjavac.xml
 --- eclipse-3.1.0_fc/jdtcoresrc/compilejdtcorewithjavac.xml	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withbootstrap/jdtcoresrc/compilejdtcorewithjavac.xml	2005-03-11 15:30:48.974841683 -0500
-@@ -0,0 +1,47 @@
++++ eclipse-3.1.0_fc.withbootstrap/jdtcoresrc/compilejdtcorewithjavac.xml	2005-04-13 21:33:36.466986297 -0400
+@@ -0,0 +1,51 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +
 +<!-- build script to create a batch compiler from org.eclipse.jdt.core -->
@@ -79,10 +79,14 @@
 +		<copy todir="${srcdir}">
 +			<fileset dir="../plugins/org.eclipse.jdt.core/antadapter">
 +				<include name="**/*" />
++				<exclude name="**/CheckDebugAttributes.java"/>
 +			</fileset>
 +			<fileset dir="../plugins/org.eclipse.jdt.core/compiler">
 +				<include name="**/*" />
 +			</fileset>
++			<fileset dir="../plugins/org.eclipse.jdt.core/batch">
++				<include name="**/*" />
++			</fileset>
 +		</copy>
 +	</target>
 +
@@ -115,9 +119,9 @@
 +
 +	</target>
 +</project>
-diff -uNr eclipse-3.1.0_fc/jdtcoresrc/compilejdtcore.xml eclipse-3.1.0_fc.withbootstrap/jdtcoresrc/compilejdtcore.xml
+diff -ruN eclipse-3.1.0_fc/jdtcoresrc/compilejdtcore.xml eclipse-3.1.0_fc.withbootstrap/jdtcoresrc/compilejdtcore.xml
 --- eclipse-3.1.0_fc/jdtcoresrc/compilejdtcore.xml	1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.withbootstrap/jdtcoresrc/compilejdtcore.xml	2005-03-11 15:31:12.823028972 -0500
++++ eclipse-3.1.0_fc.withbootstrap/jdtcoresrc/compilejdtcore.xml	2005-04-13 18:39:04.000000000 -0400
 @@ -0,0 +1,56 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- eclipse.spec	12 Apr 2005 20:38:29 -0000	1.101
+++ eclipse.spec	14 Apr 2005 01:52:09 -0000	1.102
@@ -22,7 +22,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:	0.M5.19
+Release:	0.M5.20
 License:        CPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1004,6 +1004,9 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
+* Wed Apr 13 2005 Ben Konrath <bkonrath at redhat.com> 3.1.0_fc-0.M5.20
+- Fix the bootstrap patch (the ecj jar was missing some files).
+
 * Tue Apr 12 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-0.M5.19
 - Add Requires(post,postun): java-1.4.2-gcj-compat for rebuild-gcj-db (Joe
   Orton).