[eclipse] 814332: Documentation is not pointing to locally installed javadoc https://bugzilla.redhat.com/show_

Krzysztof Daniel kdaniel at fedoraproject.org
Fri Apr 20 09:43:04 UTC 2012


commit 70451e65181c9c977c515fe3c5abed7ff445ff33
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Fri Apr 20 11:42:51 2012 +0200

    814332: Documentation is not pointing to locally installed javadoc
    https://bugzilla.redhat.com/show_bug.cgi?id=814332

 eclipse.spec |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 123a3f3..978df6c 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -20,7 +20,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        0.15.I201204171000%{?dist}
+Release:        0.16.I201204171000%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -203,15 +203,22 @@ pushd build/eclipse-%{eclipse_version}-%{build_id}-src
 
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
-sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
+sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
    -e "/osgi\.org/d" \
    -e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf.filetransfer_3.0.0.v20090302-0803.jar\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \
     plugins/org.eclipse.platform.doc.isv/platformOptions.txt
-sed -i -e "s|http://java.sun.com/j2se/1.5/docs/api|%{_datadir}/javadoc/java|" \
+sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
    -e "s/win32.win32.x86/gtk.linux.%{eclipse_arch}/" \
    plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
-sed -i -e "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java|" \
+sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \
+   -e "/osgi\.org/d" \
+   plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
+sed -i -e "s|http://download.oracle.com/javase/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
    -e "s/motif.linux.x86/gtk.linux.%{eclipse_arch}/" \
+   -e "/osgi\.org/d" \
+   plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
+   plugins/org.eclipse.pde.doc.user/pdeOptions.txt
+sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
    plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
    plugins/org.eclipse.pde.doc.user/pdeOptions.txt
 
@@ -655,6 +662,9 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/dropins/sdk
 
 %changelog
+* Fri Apr 20 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-0.16.I201204171000
+- Bug 814332 - Documentation is not pointing to locally installed javadoc. 
+
 * Thu Apr 19 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-0.15.I201204171000
 - Amendment to previous release.
 


More information about the scm-commits mailing list