From b10564b7e95a1e034b824a547edd066546b5a054 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Jan 12 2005 17:51:05 +0000
Subject: . remove eclipse-bootstrapjavahome.tar.gz

Wed Jan 12 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.6
- use installed java-devel rpm instead of bootstrapping one

---

diff --git a/eclipse.spec b/eclipse.spec
index 9cc2227..c445166 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -55,7 +55,7 @@ ExclusiveArch:		i386
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}
-Release:        0.%{eclipse_milestone}.5
+Release:        0.%{eclipse_milestone}.6
 License:        CPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -76,7 +76,6 @@ Source18:	%{name}-redhat-splash.png
 Source20:	%{name}-rhdocs-r20041017.tar.gz
 Source21:	%{name}-copy-platform.sh
 Source22:       %{name}-tutorials.pdf
-Source23:       %{name}-bootstrapjavahome.tar.gz
 
 Patch0:         %{name}-make-gtk.patch
 Patch1:         %{name}-make-core.patch
@@ -111,6 +110,7 @@ BuildRequires:  %{_libdir}/pkgconfig/gtk+-2.0.pc
 # RH 8.0, 9, FC 1: glib2-devel
 BuildRequires:  %{_libdir}/pkgconfig/gthread-2.0.pc
 BuildRequires:	gcc4-java >= 4.0.0-0.17
+BuildRequires:	java-devel >= 1.4.2
 
 
 %description
@@ -260,14 +260,8 @@ if test -n "$src"; then
   xargs -0 perl -pi -e "s/$src/$dest/g;"
 fi
 
-# Set up bootstrapping JAVA_HOME
-tar zxvf %{SOURCE23}
-
 %build
 export ANT_OPTS=-Xmx768m
-export JAVA_HOME=`pwd`/%{name}-bootstrapjavahome
-%define java_home`pwd`/%{name}-bootstrapjavahome
-export PATH=`pwd`/%{name}-bootstrapjavahome/bin:$PATH
 
 %if %selfbuild
 ### -------- ecj build -------- 
@@ -296,8 +290,8 @@ export PATH=`pwd`/%{name}-bootstrapjavahome/bin:$PATH
 #mv plugins/org.eclipse.jdt.core.original plugins/org.eclipse.jdt.core
 #
 ## Now use this built ecj for the rest of the build
-# FIXME:  gcj PR 19295 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19295
 #export CLASSPATH=`pwd`/ecj-bootstrap.jar:$CLASSPATH
+# FIXME:  gcj PR 19295 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19295
 export CLASSPATH=`pwd`/jdtcore.jar:$CLASSPATH
 # -------- ecj build -------- 
 %endif
@@ -413,19 +407,9 @@ pushd plugins/org.eclipse.update.core.linux/src
 gcc $RPM_OPT_FLAGS -fPIC -o  libupdate.so -shared *.c -I.  -I%{java_home}/include
 popd
 
-#pushd plugins/org.eclipse.team.cvs.core/library
-#make \
-#JAVA_HOME="%{java_home}" \
-#OS="linux" \
-#clean all
-#popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# Use our bootstrapped JAVA_HOME and javac (ecj)
-export JAVA_HOME=`pwd`/%{name}-bootstrapjavahome
-export PATH=`pwd`/%{name}-bootstrapjavahome/bin:$PATH
 # FIXME:  gcj PR 19295 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19295
 #export CLASSPATH=`pwd`/ecj-bootstrap.jar:$CLASSPATH
 export CLASSPATH=`pwd`/jdtcore.jar:$CLASSPATH
@@ -686,6 +670,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644,root,root,0755)
 
 %changelog
+* Wed Jan 12 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.6
+- use installed java-devel rpm instead of bootstrapping one
+
 * Tue Jan 11 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.5
 - fix when we set JAVA_HOME variable