From 5726698e3c8e1f00a7840e0b6ea001fc67b820f6 Mon Sep 17 00:00:00 2001
From: Ben Konrath <bkonrath@fedoraproject.org>
Date: Apr 11 2007 10:21:11 +0000
Subject: - Fix links to system-installed javadocs.


---

diff --git a/eclipse.spec b/eclipse.spec
index 58d6da1..afcbccf 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -59,9 +59,6 @@ Patch11:        %{name}-usebuiltlauncher.patch
 #    (which contains the JNI .sos) is in %{_libdir}
 # We should investigate whether or not this can go upstream
 Patch12:        %{name}-launcher-set-install-dir-and-shared-config.patch
-# Don't attempt to link to Sun's javadocs
-# FIXME:  could use sed instead
-Patch13:        %{name}-javadoclinks.patch
 # Always generate debug info when building RPMs (Andrew Haley)
 # This needs to be investigated for getEnv changes
 Patch14:        %{name}-ecj-rpmdebuginfo.patch
@@ -431,13 +428,15 @@ sed --in-place "s:/usr/lib/eclipse:%{_libdir}/%{name}:" library/eclipse.c
 sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c
 popd
 
-# Link against our system-installed javadocs
-%patch13 -p0
-sed --in-place "s:/usr/share/:%{_datadir}/:g"           \
-        plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt  \
-        plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
-        plugins/org.eclipse.pde.doc.user/pdeOptions     \
-        plugins/org.eclipse.platform.doc.isv/platformOptions.txt 
+# use our system-installed javadocs
+sed --in-place "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadocs/java|" \
+   plugins/org.eclipse.platform.doc.isv/platformOptions.txt
+sed --in-place "s|http://java.sun.com/j2se/1.5/docs/api|%{_datadir}/javadocs/java|" \
+   plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt                     \
+   plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
+sed --in-place "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadocs/java|" \
+   plugins/org.eclipse.pde.doc.user/pdeOptions.txt                       \
+   plugins/org.eclipse.pde.doc.user/pdeOptions
 %patch14 -p0
 
 pushd plugins/org.eclipse.pde.build
@@ -1719,8 +1718,9 @@ fi
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
-* Tue Apr 03 2007 Ben Konrath <bkonrath@redhat.com> 3.2.2-8
+* Wed Apr 11 2007 Ben Konrath <bkonrath@redhat.com> 3.2.2-8
 - Link to system-installed jsch instead of including it. 
+- Fix links to system-installed javadocs.
 
 * Tue Mar 20 2007 Ben Konrath <bkonrath@redhat.com> 3.2.2-7
 - Remove search and processing for mac encoded files.