Index: gcc.spec
===================================================================
RCS file: /cvsroot/SPECS/gcc.spec,v
retrieving revision 1.548
diff -u -r1.548 gcc.spec
--- gcc.spec	27 Jun 2008 20:43:20 -0000	1.548
+++ gcc.spec	7 Jul 2008 14:45:38 -0000
@@ -60,6 +60,10 @@
 Source0:	ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5:	4afa0290cc3a41ac8822666f1110de98
 Source1:	%{name}-optimize-la.pl
+%if %{with java}
+Source2:	ftp://sourceware.org/pub/java/ecj-%{_major_ver}.jar
+# Source2-md5:	fd299f26c02268878b5d6c0e86f57c43
+%endif
 Patch100:	%{name}-branch.diff.bz2
 Patch101:	%{name}-ix86-branch.diff.bz2
 Patch0:		%{name}-info.patch
@@ -128,6 +132,8 @@
 BuildRequires:	gtk+2-devel >= 2:2.4.0
 BuildRequires:	libart_lgpl-devel
 BuildRequires:	pango-devel
+# libjava - gtk
+BuildRequires:	readline-devel 
 BuildRequires:	xorg-lib-libXtst-devel
 %endif
 %if %{with qt}
@@ -1319,6 +1325,11 @@
 
 mv ChangeLog ChangeLog.general
 
+%if %{with java}
+# see contrib/download_ecj
+install %{SOURCE2} ./ecj.jar
+%endif
+
 # override snapshot version.
 echo %{version} > gcc/BASE-VER
 echo "release" > gcc/DEV-PHASE
@@ -1969,6 +1980,7 @@
 %attr(755,root,root) %{_bindir}/jcf-dump
 %attr(755,root,root) %{_bindir}/jv-*
 %attr(755,root,root) %{_bindir}/*-gcj*
+%attr(755,root,root) %{_libdir}/gcc/*/*/ecj1
 %attr(755,root,root) %{_libdir}/gcc/*/*/jc1
 %attr(755,root,root) %{_libdir}/gcc/*/*/jvgenmain
 %{_infodir}/cp-tools*
@@ -2010,6 +2022,7 @@
 %attr(755,root,root) %{_libdir}/%{gcjdbexecdir}/libxmlj.so*
 %{_libdir}/logging.properties
 %{_javadir}/libgcj*.jar
+%{_javadir}/ecj.jar
 %{_mandir}/man1/gij*
 
 %files -n libgcj-devel
@@ -2032,6 +2045,7 @@
 %{?with_gtk:%{_libdir}/%{gcjdbexecdir}/libjawt.la}
 %{_libdir}/%{gcjdbexecdir}/libjvm.la
 %{?with_qt:%{_libdir}/%{gcjdbexecdir}/libqtpeer.la}
+%{?with_mozilla:%{_libdir}/%{gcjdbexecdir}/libgcjwebplugin.la}
 %{_libdir}/%{gcjdbexecdir}/libxmlj.la
 %dir %{_libdir}/security
 %{_libdir}/security/*