rpms/eclipse/devel eclipse-javadoclinks.patch, 1.2, 1.3 eclipse.spec, 1.216, 1.217

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Dec 19 16:52:30 UTC 2005 

Author: overholt

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

Modified Files:
	eclipse-javadoclinks.patch eclipse.spec 
Log Message:
* Mon Dec 19 2005 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_11fc
- Update patch for offline javadoc linking.
- Rebuild with new gjdoc (indices generated at build time - yay! rh#157372,
  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

Index: eclipse-javadoclinks.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-javadoclinks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-javadoclinks.patch	14 Dec 2005 02:22:41 -0000	1.2
+++ eclipse-javadoclinks.patch	19 Dec 2005 16:52:27 -0000	1.3
@@ -1,39 +1,33 @@
 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-13 21:18:33.000000000 -0500
-+++ plugins/org.eclipse.jdt.doc.isv/jdtOptions	2005-12-13 21:20:40.000000000 -0500
-@@ -11,9 +11,6 @@
+--- 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
+ -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
  
- org.eclipse.jdt.core
- org.eclipse.jdt.core.compiler
 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-13 21:17:59.000000000 -0500
-+++ plugins/org.eclipse.pde.doc.user/pdeOptions	2005-12-13 21:20:46.000000000 -0500
-@@ -9,10 +9,6 @@
+--- 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
- 
- org.eclipse.pde.core
- org.eclipse.pde.core.build
+ -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-13 21:17:56.000000000 -0500
-+++ plugins/org.eclipse.platform.doc.isv/platformOptions	2005-12-13 21:20:51.000000000 -0500
-@@ -10,8 +10,6 @@
+--- 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
+ -link  ../osgi
  
  org.eclipse.ant.core
- org.eclipse.compare


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- eclipse.spec	15 Dec 2005 03:32:58 -0000	1.216
+++ eclipse.spec	19 Dec 2005 16:52:27 -0000	1.217
@@ -23,7 +23,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_10fc
+Release:        1jpp_11fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -111,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
+# Don't attempt to link to Sun's javadocs
 Patch48:	%{name}-javadoclinks.patch
 
 %if %{gcj_support}
@@ -1267,6 +1268,11 @@
 %{_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_11fc
+- Update patch for offline javadoc linking.
+- Rebuild with new gjdoc (indices generated at build time - yay! rh#157372,
+  rh#161147).
+
 * Tue Dec 13 2005 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_10fc
 - Add patch for offline javadoc building/linking.

More information about the fedora-cvs-commits mailing list