rpms/eclipse/devel eclipse-native-splash-3.1.png, NONE, 1.1 eclipse-tomcat5-build.2.patch, 1.2, 1.3 eclipse.spec, 1.158, 1.159 eclipse-build-activeHelpSample.jar.patch, 1.4, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jun 28 16:08:29 UTC 2005
Author: overholt
Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7116
Modified Files:
eclipse-tomcat5-build.2.patch eclipse.spec
Added Files:
eclipse-native-splash-3.1.png
Removed Files:
eclipse-build-activeHelpSample.jar.patch
Log Message:
* Tue Jun 28 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-1
- Import 3.1.
- Update splash screen.
eclipse-tomcat5-build.2.patch:
assemble.org.eclipse.sdk.aix.motif.ppc.xml | 2 +-
assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml | 2 +-
assemble.org.eclipse.sdk.hpux.motif.ia64.xml | 2 +-
assemble.org.eclipse.sdk.solaris.gtk.sparc.xml | 2 +-
assemble.org.eclipse.sdk.solaris.motif.sparc.xml | 2 +-
assemble.org.eclipse.sdk.win32.win32.x86.xml | 2 +-
features/org.eclipse.platform/build.xml | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
Index: eclipse-tomcat5-build.2.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat5-build.2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-tomcat5-build.2.patch 27 Jun 2005 19:38:29 -0000 1.2
+++ eclipse-tomcat5-build.2.patch 28 Jun 2005 16:08:27 -0000 1.3
@@ -1,78 +1,78 @@
diff -uNr assemble.org.eclipse.sdk.aix.motif.ppc.xml assemble.org.eclipse.sdk.aix.motif.ppc.xml
---- assemble.org.eclipse.sdk.aix.motif.ppc.xml 2005-06-27 10:43:24.000000000 -0400
-+++ assemble.org.eclipse.sdk.aix.motif.ppc.xml 2005-06-27 10:45:41.000000000 -0400
-@@ -617,7 +617,7 @@
- <arg line="${pluginArchivePrefix}/org.apache.ant_1.6.5"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.osgi_3.1.0.jar"/>
+--- assemble.org.eclipse.sdk.aix.motif.ppc.xml 2005-06-27 16:12:54.000000000 -0400
++++ assemble.org.eclipse.sdk.aix.motif.ppc.xml 2005-06-27 16:13:47.000000000 -0400
+@@ -610,7 +610,7 @@
+ <arg line="${pluginArchivePrefix}/org.eclipse.swt_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.filebuffers_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.runtime.compatibility_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.jdt_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.jdt.core_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.0"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.ui.workbench.texteditor_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.ui_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.help.appserver_3.1.0.jar"/>
diff -uNr assemble.org.eclipse.sdk.hpux.motif.ia64.xml assemble.org.eclipse.sdk.hpux.motif.ia64.xml
---- assemble.org.eclipse.sdk.hpux.motif.ia64.xml 2005-06-27 10:43:24.000000000 -0400
-+++ assemble.org.eclipse.sdk.hpux.motif.ia64.xml 2005-06-27 10:46:02.000000000 -0400
-@@ -606,7 +606,7 @@
- <zipfileset dir="${eclipse.base}/plugins/org.apache.ant_1.6.5" prefix="${pluginArchivePrefix}/org.apache.ant_1.6.5" />
- <zipfileset dir="${eclipse.base}/plugins/org.eclipse.team.cvs.ssh2_3.1.0" prefix="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0" />
- <zipfileset file="${eclipse.base}/plugins/org.eclipse.osgi_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.osgi_3.1.0.jar" />
+--- assemble.org.eclipse.sdk.hpux.motif.ia64.xml 2005-06-27 16:12:54.000000000 -0400
++++ assemble.org.eclipse.sdk.hpux.motif.ia64.xml 2005-06-27 16:14:06.000000000 -0400
+@@ -601,7 +601,7 @@
+ <zipfileset file="${eclipse.base}/plugins/org.eclipse.swt_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.swt_3.1.0.jar" />
+ <zipfileset file="${eclipse.base}/plugins/org.eclipse.core.filebuffers_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.filebuffers_3.1.0.jar" />
+ <zipfileset file="${eclipse.base}/plugins/org.eclipse.core.runtime.compatibility_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.runtime.compatibility_3.1.0.jar" />
- <zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_4.1.30.1" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1" />
+ <zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_5.0.30" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30" />
- <zipfileset file="${eclipse.base}/plugins/org.eclipse.jdt_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.jdt_3.1.0.jar" />
- <zipfileset file="${eclipse.base}/plugins/org.eclipse.jdt.core_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.jdt.core_3.1.0.jar" />
- <zipfileset dir="${eclipse.base}/plugins/org.eclipse.jdt.debug_3.1.0" prefix="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.0" />
+ <zipfileset file="${eclipse.base}/plugins/org.eclipse.ui.workbench.texteditor_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.ui.workbench.texteditor_3.1.0.jar" />
+ <zipfileset file="${eclipse.base}/plugins/org.eclipse.team.ui_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.team.ui_3.1.0.jar" />
+ <zipfileset file="${eclipse.base}/plugins/org.eclipse.help.appserver_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.help.appserver_3.1.0.jar" />
diff -uNr assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml
---- assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml 2005-06-27 10:43:24.000000000 -0400
-+++ assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml 2005-06-27 10:46:36.000000000 -0400
-@@ -626,7 +626,7 @@
- <arg line="${pluginArchivePrefix}/org.apache.ant_1.6.5"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.osgi_3.1.0.jar"/>
+--- assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml 2005-06-27 16:12:54.000000000 -0400
++++ assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml 2005-06-27 16:14:11.000000000 -0400
+@@ -620,7 +620,7 @@
+ <arg line="${pluginArchivePrefix}/org.eclipse.swt_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.filebuffers_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.runtime.compatibility_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.jdt_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.jdt.core_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.0"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.ui.workbench.texteditor_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.ui_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.help.appserver_3.1.0.jar"/>
diff -uNr assemble.org.eclipse.sdk.solaris.gtk.sparc.xml assemble.org.eclipse.sdk.solaris.gtk.sparc.xml
---- assemble.org.eclipse.sdk.solaris.gtk.sparc.xml 2005-06-27 10:43:24.000000000 -0400
-+++ assemble.org.eclipse.sdk.solaris.gtk.sparc.xml 2005-06-27 10:46:46.000000000 -0400
-@@ -616,7 +616,7 @@
- <arg line="${pluginArchivePrefix}/org.apache.ant_1.6.5"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.osgi_3.1.0.jar"/>
+--- assemble.org.eclipse.sdk.solaris.gtk.sparc.xml 2005-06-27 16:12:54.000000000 -0400
++++ assemble.org.eclipse.sdk.solaris.gtk.sparc.xml 2005-06-27 16:14:15.000000000 -0400
+@@ -610,7 +610,7 @@
+ <arg line="${pluginArchivePrefix}/org.eclipse.swt_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.filebuffers_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.runtime.compatibility_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.jdt_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.jdt.core_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.0"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.ui.workbench.texteditor_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.ui_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.help.appserver_3.1.0.jar"/>
diff -uNr assemble.org.eclipse.sdk.solaris.motif.sparc.xml assemble.org.eclipse.sdk.solaris.motif.sparc.xml
---- assemble.org.eclipse.sdk.solaris.motif.sparc.xml 2005-06-27 10:43:24.000000000 -0400
-+++ assemble.org.eclipse.sdk.solaris.motif.sparc.xml 2005-06-27 10:47:00.000000000 -0400
-@@ -616,7 +616,7 @@
- <arg line="${pluginArchivePrefix}/org.apache.ant_1.6.5"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.osgi_3.1.0.jar"/>
+--- assemble.org.eclipse.sdk.solaris.motif.sparc.xml 2005-06-27 16:12:54.000000000 -0400
++++ assemble.org.eclipse.sdk.solaris.motif.sparc.xml 2005-06-27 16:14:19.000000000 -0400
+@@ -610,7 +610,7 @@
+ <arg line="${pluginArchivePrefix}/org.eclipse.swt_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.filebuffers_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.runtime.compatibility_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.jdt_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.jdt.core_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.0"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.ui.workbench.texteditor_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.ui_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.help.appserver_3.1.0.jar"/>
diff -uNr assemble.org.eclipse.sdk.win32.win32.x86.xml assemble.org.eclipse.sdk.win32.win32.x86.xml
---- assemble.org.eclipse.sdk.win32.win32.x86.xml 2005-06-27 10:43:24.000000000 -0400
-+++ assemble.org.eclipse.sdk.win32.win32.x86.xml 2005-06-27 10:47:12.000000000 -0400
-@@ -641,7 +641,7 @@
- <arg line="${pluginArchivePrefix}/org.apache.ant_1.6.5"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.osgi_3.1.0.jar"/>
+--- assemble.org.eclipse.sdk.win32.win32.x86.xml 2005-06-27 16:12:54.000000000 -0400
++++ assemble.org.eclipse.sdk.win32.win32.x86.xml 2005-06-27 16:14:23.000000000 -0400
+@@ -637,7 +637,7 @@
+ <arg line="${pluginArchivePrefix}/org.eclipse.swt_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.filebuffers_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.runtime.compatibility_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.jdt_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.jdt.core_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.0"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.ui.workbench.texteditor_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.ui_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.help.appserver_3.1.0.jar"/>
diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/build.xml
---- features/org.eclipse.platform/build.xml 2005-06-27 10:44:45.000000000 -0400
-+++ features/org.eclipse.platform/build.xml 2005-06-27 10:43:41.000000000 -0400
+--- features/org.eclipse.platform/build.xml 2005-06-27 16:24:04.000000000 -0400
++++ features/org.eclipse.platform/build.xml 2005-06-27 16:24:19.000000000 -0400
@@ -346,7 +346,7 @@
<copy todir="${feature.base}/features/org.eclipse.platform_3.1.0" failonerror="true" overwrite="false">
<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" />
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- eclipse.spec 28 Jun 2005 13:43:09 -0000 1.158
+++ eclipse.spec 28 Jun 2005 16:08:27 -0000 1.159
@@ -12,7 +12,7 @@
%define eclipse_micro 0
%define eclipse_oldmajminmic 3.0.0
%define libname libswt3
-%define build_id S-3.1RC4-200506241300
+%define build_id I20050627-1435
# All arches line up except i386 -> x86
%ifarch %{ix86}
@@ -24,11 +24,11 @@
Summary: %{pkg_summary}
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}_fc
-Release: 0.RC4.1
+Release: 1
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
-Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.1RC4-200506241300/eclipse-sourceBuild-srcIncluded-3.1RC4.zip
+Source0: http://download.eclipse.org/eclipse/downloads/drops/I20050627-1435/eclipse-sourceBuild-srcIncluded-I20050627-1435.zip
Source1: %{name}.script
Source2: %{name}.desktop
Source5: %{name}-48.png
@@ -37,10 +37,7 @@
Source8: %{name}-pde.install
Source9: %{name}-platform.install
Source10: %{libname}-gtk2.install
-# this should be replaced with:
-# Source11: %{name}-native-splash-3.1.png
-# when Eclipse 3.1 comes out.
-Source11: %{name}-native-splash-3.1-M7.png
+Source11: %{name}-native-splash-3.1.png
Source16: %{name}-copy-platform.sh
Source17: %{name}-efj-wrapper.sh
# this zip was taken from the M6 source drop
@@ -1244,6 +1241,10 @@
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
%changelog
+* Tue Jun 28 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-1
+- Import 3.1.
+- Update splash screen.
+
* Sun Jun 26 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-0.RC4.1
- Import 3.1 RC4.
- Remove activeHelpSample.jar building patch as it's now fixed upstream.
--- eclipse-build-activeHelpSample.jar.patch DELETED ---
More information about the fedora-cvs-commits
mailing list