- Use new java-1.4.2-gcj-compat-javadoc package.

- Always generate debug info when building RPMs (Andrew Haley).

eclipse.spec

@@ -22,7 +22,7 @@ Epoch:	1
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_4fc
+Release:        1jpp_5fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -108,6 +108,8 @@ Patch46:	%{name}-libswt-xpcomgcc4.patch
 Patch47:	%{name}-launcher-link.patch
 # Don't attempt to link to Sun's javadocs
 Patch48:	%{name}-javadoclinks.patch
+# Always generate debug info when building RPMs (Andrew Haley)
+Patch49:	%{name}-ecj-rpmdebuginfo.patch
 
 %if %{gcj_support}
 ExcludeArch: ppc64 s390 s390x
@@ -130,6 +132,7 @@ BuildRequires:  nspr-devel
 BuildRequires:  libXtst-devel
 BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
+BuildRequires:  java-javadoc
 %if %{gcj_support}
 BuildRequires:	gcc-java >= 4.0.2
 BuildRequires:	java-gcj-compat-devel >= 1.0.43
@@ -196,6 +199,7 @@ Requires:       %{name}-rcp = %{epoch}:%{version}-%{release}
 Requires:       %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 Requires:       /usr/bin/perl
 Requires:       /usr/bin/mozilla
+Requires:       java-javadoc
 
 PreReq:         gtk2 >= 2.6
 
@@ -413,7 +417,18 @@ pushd features/org.eclipse.platform.launchers
 %patch37 -p1
 %patch47 -p1
 popd
+# Link against our system-installed javadocs
 %patch48 -p0
+pushd plugins/org.eclipse.jdt.doc.isv
+sed --in-place "s:/usr/share/:%{_datadir}/:g" jdtOptions
+popd
+pushd plugins/org.eclipse.pde.doc.user
+sed --in-place "s:/usr/share/:%{_datadir}/:g" pdeOptions
+popd
+pushd plugins/org.eclipse.platform.doc.isv
+sed --in-place "s:/usr/share/:%{_datadir}/:g" platformOptions
+popd
+%patch49 -p0
 
 %if %{gcj_support}
   # Fedora splash screen.
@@ -1258,6 +1273,10 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
+* Tue Feb 07 2006 Andrew Overholt <overholt@redhat.com> 3.1.2-1jpp_5fc
+- Use new java-1.4.2-gcj-compat-javadoc package.
+- Always generate debug info when building RPMs (Andrew Haley).
+
 * Mon Feb 06 2006 Andrew Overholt <overholt@redhat.com> 3.1.2-1jpp_4fc
 - Add an swt-gtk.jar and fix symlink to point to correct jar (rh#180000).
 - Link against generic libjawt.so (rh#158755).