rpms/eclipse/devel 3.3-TODO.txt, NONE, 1.1 eclipse.spec, 1.429, 1.430 eclipse-add-ppc64-sparc64-s390-s390x.patch, 1.4, NONE eclipse-libupdatebuild.patch, 1.1, NONE

[Ben Konrath (bkonrath)]

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3191

Modified Files:
	eclipse.spec 
Added Files:
	3.3-TODO.txt 
Removed Files:
	eclipse-add-ppc64-sparc64-s390-s390x.patch 
	eclipse-libupdatebuild.patch 
Log Message:
- Pull in some fixes from F-7



--- NEW FILE 3.3-TODO.txt ---
* check for correct files listings -- may need to add another sub-package
* re-enable timestamp squashing
* enable ecj on ppc64, s390{,x}, sparc{,64}
* icu4j 3.6.0
* update package build
* splashscreen
* junit 4.1
* ant 1.7
* deal with these: 

com.ibm.icu_3.6.1.v20070417.jar
com.jcraft.jsch_0.1.28.jar
javax.servlet_2.4.0.v200704241052.jar
javax.servlet.jsp_2.0.0.v200703221034.jar
org.apache.commons.el_1.0.0.v200704241052.jar
org.apache.commons.logging_1.0.4.v200701082340.jar
org.apache.jasper_5.5.17.v200704241052.jar
org.apache.lucene_1.9.1.v200703221049.jar
org.apache.lucene.analysis_1.9.1.v200703221049.jar
org.mortbay.jetty_5.1.11.v200701082340.jar
 


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- eclipse.spec	24 May 2007 05:51:41 -0000	1.429
+++ eclipse.spec	24 May 2007 06:11:03 -0000	1.430
@@ -55,9 +55,6 @@
 #    (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
@@ -373,13 +370,16 @@
 zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library
 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


--- eclipse-add-ppc64-sparc64-s390-s390x.patch DELETED ---


--- eclipse-libupdatebuild.patch DELETED ---