rpms/eclipse/FC-4 eclipse-javadoclinks.patch, NONE, 1.1 eclipse.spec, 1.167, 1.168

[fedora-cvs-commits at redhat.com]

Author: overholt

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

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-javadoclinks.patch 
Log Message:
* Mon Dec 19 2005 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_1fc.FC4.11
- Update patch for offline javadoc linking.
- Rebuild with new gjdoc (rh#161147).


eclipse-javadoclinks.patch:
 org.eclipse.jdt.doc.isv/jdtOptions           |    0 
 org.eclipse.pde.doc.user/pdeOptions          |    0 
 org.eclipse.platform.doc.isv/platformOptions |    0 
 3 files changed

--- NEW FILE eclipse-javadoclinks.patch ---
diff -uNr plugins/org.eclipse.jdt.doc.isv/jdtOptions plugins/org.eclipse.jdt.doc.isv/jdtOptions
--- plugins/org.eclipse.jdt.doc.isv/jdtOptions	2005-12-19 11:30:24.000000000 -0500
+++ plugins/org.eclipse.jdt.doc.isv/jdtOptions	2005-12-19 11:33:01.000000000 -0500
@@ -11,7 +11,6 @@
 -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 ./../../../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 -uNr plugins/org.eclipse.pde.doc.user/pdeOptions plugins/org.eclipse.pde.doc.user/pdeOptions
--- plugins/org.eclipse.pde.doc.user/pdeOptions	2005-12-19 11:31:44.000000000 -0500
+++ plugins/org.eclipse.pde.doc.user/pdeOptions	2005-12-19 11:33:06.000000000 -0500
@@ -9,7 +9,6 @@
 -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 ./../../../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-12-19 11:31:54.000000000 -0500
+++ plugins/org.eclipse.platform.doc.isv/platformOptions	2005-12-19 11:33:13.000000000 -0500
@@ -10,7 +10,6 @@
 -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
 -link  ../osgi
 
 org.eclipse.ant.core


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- eclipse.spec	13 Dec 2005 21:06:07 -0000	1.167
+++ eclipse.spec	19 Dec 2005 22:03:17 -0000	1.168
@@ -23,7 +23,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_1fc.FC4.10
+Release:        1jpp_1fc.FC4.11
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -105,6 +105,8 @@
 # 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
+# Don't attempt to link to Sun's javadocs
+Patch48:	%{name}-javadoclinks.patch
 
 %if %{gcj_support}
 ExcludeArch: s390 s390x ia64 ppc64
@@ -400,6 +402,7 @@
 %patch37 -p1
 %patch47 -p1
 popd
+%patch48 -p0
 
 %if %{gcj_support}
   # Fedora splash screen.
@@ -1264,6 +1267,10 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
 
 %changelog
+* Mon Dec 19 2005 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_1fc.FC4.11
+- Update patch for offline javadoc linking.
+- Rebuild with new gjdoc (rh#161147).
+
 * Tue Dec 13 2005 Igor Foox <ifoox at redhat.com> 3.1.1-1jpp_1fc.FC4.10
 - New version of launcher path (rh#175454).