rpms/eclipse/devel eclipse-offlinejavadoc.patch, NONE, 1.1 eclipse.spec, 1.212, 1.213

Tue Dec 13 20:53:31 UTC 2005

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30731

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-offlinejavadoc.patch 
Log Message:
* Tue Dec 13 2005 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_10fc
- Add patch for offline javadoc building/linking.


eclipse-offlinejavadoc.patch:
 org.eclipse.jdt.doc.isv/jdtOptions           |    1 +
 org.eclipse.pde.doc.user/pdeOptions          |    1 +
 org.eclipse.platform.doc.isv/platformOptions |    1 +
 3 files changed, 3 insertions(+)

--- NEW FILE eclipse-offlinejavadoc.patch ---
diff -u -r plugins/org.eclipse.jdt.doc.isv/jdtOptions plugins/org.eclipse.jdt.doc.isv/jdtOptions
--- plugins/org.eclipse.jdt.doc.isv/jdtOptions      2005-10-21 17:15:47.000000000 +0200
+++ plugins/org.eclipse.jdt.doc.isv/jdtOptions      2005-10-21 17:24:53.000000000 +0200
@@ -11,7 +11,7 @@
 -bottom "Copyright (c) IBM Corp. and others 2000, 2005.  All Rights Reserved."
 -group "Java Development Tools Core Plug-in Packages" "org.eclipse.jdt.core:org.eclipse.jdt.core.*"
 -group "Java Development Tools UI Plug-in Packages" "org.eclipse.jdt.ui:org.eclipse.jdt.ui.*"
--link http://java.sun.com/j2se/1.4/docs/api
+-linkoffline http://java.sun.com/j2se/1.4/docs/api
 -linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api ../org.eclipse.platform.doc.isv/reference/api
 -linkoffline ./../../../org.eclipse.platform.doc.isv/reference/osgi ../org.eclipse.platform.doc.isv/reference/osgi
 
diff -u -r plugins/org.eclipse.pde.doc.user/pdeOptions plugins/org.eclipse.pde.doc.user/pdeOptions
--- plugins/org.eclipse.pde.doc.user/pdeOptions     2005-10-21 17:15:47.000000000 +0200
+++ plugins/org.eclipse.pde.doc.user/pdeOptions     2005-10-21 17:25:57.000000000 +0200
@@ -9,7 +9,7 @@
 -doctitle "Eclipse PDE API Specification"
 -header "<b>Eclipse PDE</b><br>Release 3.1"
 -bottom "Copyright (c) IBM Corp. and others 2000, 2005.  All Rights Reserved."
--link http://java.sun.com/j2se/1.4/docs/api
+-linkoffline http://java.sun.com/j2se/1.4/docs/api
 -linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api ../org.eclipse.platform.doc.isv/reference/api
 -linkoffline ./../../../org.eclipse.platform.doc.isv/reference/osgi ../org.eclipse.platform.doc.isv/reference/osgi
 -linkoffline ./../../../org.eclipse.jdt.doc.isv/reference/api ../org.eclipse.jdt.doc.isv/reference/api
diff -uNr plugins/org.eclipse.platform.doc.isv/platformOptions plugins/org.eclipse.platform.doc.isv/platformOptions
--- plugins/org.eclipse.platform.doc.isv/platformOptions	2005-07-04 14:25:31.000000000 -0400
+++ plugins/org.eclipse.platform.doc.isv/platformOptions	2005-07-04 14:25:19.000000000 -0400
@@ -9,7 +9,7 @@
 -doctitle "Eclipse Platform API Specification"
 -header "<b>Eclipse Platform</b><br>Release 3.1"
 -bottom '<font size="-1"><p><a href="{@docRoot}/../misc/api-usage-rules.html">Guidelines for using Eclipse APIs</a>.</p><p>Copyright (c) IBM Corp. and others 2000, 2005. All rights reserved.</p></font>'
--link http://java.sun.com/j2se/1.4.2/docs/api
+-linkoffline http://java.sun.com/j2se/1.4.2/docs/api
 -link  ../osgi
 
 org.eclipse.ant.core


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- eclipse.spec	13 Dec 2005 05:10:57 -0000	1.212
+++ eclipse.spec	13 Dec 2005 20:53:29 -0000	1.213
@@ -38,7 +38,6 @@
 Source11:	%{name}-fedora-splash-3.1.1.png
 Source16:       %{name}-copy-platform.sh
 Source17:       %{name}-efj-wrapper.sh
-# this zip was taken from the M6 source drop
 Source19:       %{name}-filenamepatterns.txt
 Source20:	ecj.sh.in
 Source21:	rebuild-sdk-features
@@ -112,6 +111,7 @@
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=79592
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168726
 Patch47:	%{name}-launcher-link.patch
+Patch48:	%{name}-offlinejavadoc.patch
 
 %if %{gcj_support}
 ExcludeArch: s390 s390x ia64 ppc64
@@ -419,6 +419,7 @@
 %patch37 -p1
 %patch47 -p1
 popd
+%patch48 -p0
 
 %if %{gcj_support}
   # Fedora splash screen.
@@ -730,7 +731,6 @@
 popd
 ### end libswt-gtk2 symlinks
 
-# Launching script
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 pushd $RPM_BUILD_ROOT%{_bindir}
 ln -s %{_datadir}/%{name}/%{name}
@@ -1267,6 +1267,9 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
 
 %changelog
+* Tue Dec 13 2005 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_10fc
+- Add patch for offline javadoc building/linking.
+
 * Mon Dec 12 2005 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_10fc
 - Use ecj from 3.1.1 (rh#175380).
 - Remove ecj options patch as it is in ecj from 3.1.1.


