rpms/eclipse/devel .cvsignore, 1.19, 1.20 eclipse-tomcat5-build.2.patch, 1.4, 1.5 eclipse.spec, 1.233, 1.234 sources, 1.31, 1.32 eclipse-e.o111299.patch, 1.1, NONE eclipse-find.patch, 1.2, NONE eclipse-usebuiltlauncher.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Feb 1 15:32:54 UTC 2006
Author: overholt
Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24882
Modified Files:
.cvsignore eclipse-tomcat5-build.2.patch eclipse.spec sources
Removed Files:
eclipse-e.o111299.patch eclipse-find.patch
eclipse-usebuiltlauncher.patch
Log Message:
* Tue Jan 31 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_1fc
- 3.1.2.
- Remove unnecessary patches.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 13 Dec 2005 04:57:49 -0000 1.19
+++ .cvsignore 1 Feb 2006 15:32:49 -0000 1.20
@@ -1,2 +1,2 @@
-eclipse-sourceBuild-srcIncluded-3.1.1.zip
-eclipse-fedora-splash-3.1.1.png
+eclipse-sourceBuild-srcIncluded-3.1.2.zip
+eclipse-fedora-splash-3.1.2.png
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 +-
6 files changed, 6 insertions(+), 6 deletions(-)
Index: eclipse-tomcat5-build.2.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat5-build.2.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-tomcat5-build.2.patch 11 Oct 2005 21:49:42 -0000 1.4
+++ eclipse-tomcat5-build.2.patch 1 Feb 2006 15:32:50 -0000 1.5
@@ -1,84 +1,72 @@
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-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.aix.motif.ppc.xml 2005-10-11 10:57:32.000000000 -0400
-@@ -584,7 +584,7 @@
- <eclipse.brand root="${eclipse.base}/aix.motif.ppc/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
- <exec executable="zip" dir="${assemblyTempDir}">
+--- assemble.org.eclipse.sdk.aix.motif.ppc.xml 2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.aix.motif.ppc.xml 2006-01-31 13:29:08.000000000 -0500
+@@ -608,7 +608,7 @@
<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- </exec>
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
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-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.hpux.motif.ia64.xml 2005-10-11 10:57:32.000000000 -0400
-@@ -580,7 +580,7 @@
- </antcall>
- <eclipse.brand root="${eclipse.base}/hpux.motif.ia64/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
- <zip destfile="${archiveFullPath}" filesonly="false" whenempty="skip" update="true">
+--- assemble.org.eclipse.sdk.hpux.motif.ia64.xml 2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.hpux.motif.ia64.xml 2006-01-31 13:30:34.000000000 -0500
+@@ -597,7 +597,7 @@
+ <zipfileset file="${eclipse.base}/plugins/org.eclipse.core.expressions_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.expressions_3.1.0.jar" />
+ <zipfileset dir="${eclipse.base}/plugins/org.eclipse.pde.doc.user_3.1.2" prefix="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2" />
+ <zipfileset file="${eclipse.base}/plugins/org.eclipse.core.resources.compatibility_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.resources.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.help.appserver_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.help.appserver_3.1.0.jar" />
- <zipfileset file="${eclipse.base}/plugins/org.eclipse.ant.ui_3.1.1.jar" fullpath="${pluginArchivePrefix}/org.eclipse.ant.ui_3.1.1.jar" />
- <zipfileset file="${eclipse.base}/plugins/org.eclipse.pde.runtime_3.1.1.jar" fullpath="${pluginArchivePrefix}/org.eclipse.pde.runtime_3.1.1.jar" />
++ <zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_5.0.30" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1" />
+ <zipfileset file="${eclipse.base}/plugins/org.eclipse.team.cvs.ssh_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar" />
+ <zipfileset dir="${eclipse.base}/plugins/org.eclipse.jdt.debug_3.1.1" prefix="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1" />
+ <zipfileset dir="${eclipse.base}/plugins/org.eclipse.team.cvs.ssh2_3.1.0" prefix="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0" />
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-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml 2005-10-11 10:57:32.000000000 -0400
-@@ -594,7 +594,7 @@
- <eclipse.brand root="${eclipse.base}/hpux.motif.PA_RISC/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
- <exec executable="zip" dir="${assemblyTempDir}">
+--- assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml 2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml 2006-01-31 13:31:47.000000000 -0500
+@@ -618,7 +618,7 @@
<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- </exec>
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
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-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.solaris.gtk.sparc.xml 2005-10-11 10:57:32.000000000 -0400
-@@ -584,7 +584,7 @@
- <eclipse.brand root="${eclipse.base}/solaris.gtk.sparc/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
+--- assemble.org.eclipse.sdk.solaris.gtk.sparc.xml 2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.solaris.gtk.sparc.xml 2006-01-31 13:32:20.000000000 -0500
+@@ -607,7 +607,7 @@
<exec executable="zip" dir="${assemblyTempDir}">
<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- </exec>
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
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-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.solaris.motif.sparc.xml 2005-10-11 10:57:32.000000000 -0400
-@@ -584,7 +584,7 @@
- <eclipse.brand root="${eclipse.base}/solaris.motif.sparc/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+--- assemble.org.eclipse.sdk.solaris.motif.sparc.xml 2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.solaris.motif.sparc.xml 2006-01-31 13:32:38.000000000 -0500
+@@ -609,7 +609,7 @@
+ <arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.rcp.source.solaris.motif.sparc_3.1.2"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- </exec>
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
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-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.win32.win32.x86.xml 2005-10-11 10:57:32.000000000 -0400
-@@ -608,7 +608,7 @@
- <eclipse.brand root="${eclipse.base}/win32.win32.x86/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+--- assemble.org.eclipse.sdk.win32.win32.x86.xml 2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.win32.win32.x86.xml 2006-01-31 13:32:52.000000000 -0500
+@@ -634,7 +634,7 @@
+ <arg line="${pluginArchivePrefix}/org.eclipse.rcp.source.win32.win32.x86_3.1.2"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
- <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- </exec>
- <exec executable="zip" dir="${assemblyTempDir}">
- <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
-diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/build.xml
---- features/org.eclipse.platform/build.xml 2005-10-11 10:56:12.000000000 -0400
-+++ features/org.eclipse.platform/build.xml 2005-10-11 10:57:32.000000000 -0400
-@@ -346,7 +346,7 @@
- <copy todir="${feature.base}/features/org.eclipse.platform_3.1.1" failonerror="true" overwrite="false">
- <fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" />
- </copy>
-- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.1/feature.xml" selfVersion="3.1.1" featureIds="org.eclipse.rcp,3.1.1," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.1,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.1,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.1,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.1,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.ecli!
pse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.1,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.1,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.1,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
-+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.1/feature.xml" selfVersion="3.1.1" featureIds="org.eclipse.rcp,3.1.1," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.1,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.1,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.1,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.1,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.ecli!
pse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,5.0.30,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.1,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.1,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.1,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
- <antcall target="rootFiles${os}_${ws}_${arch}"/>
- </target>
- <target name="rootFileswin32_win32_x86">
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- eclipse.spec 31 Jan 2006 11:48:09 -0000 1.233
+++ eclipse.spec 1 Feb 2006 15:32:50 -0000 1.234
@@ -9,9 +9,8 @@
%define eclipse_major 3
%define eclipse_minor 1
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro 1
+%define eclipse_micro 2
%define libname libswt3
-%define build_id M20050929-0840
# All arches line up except i386 -> x86
%ifarch %{ix86}
@@ -23,11 +22,11 @@
Summary: %{pkg_summary}
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 1jpp_16fc
+Release: 1jpp_1fc
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
-Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-sourceBuild-srcIncluded-3.1.1.zip
+Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-sourceBuild-srcIncluded-3.1.2.zip
Source2: %{name}.desktop
Source5: %{name}-48.png
Source6: %{name}.conf
@@ -35,7 +34,7 @@
Source8: %{name}-pde.install
Source9: %{name}-platform.install
Source10: %{libname}-gtk2.install
-Source11: %{name}-fedora-splash-3.1.1.png
+Source11: %{name}-fedora-splash-3.1.2.png
Source16: %{name}-copy-platform.sh
Source17: %{name}-efj-wrapper.sh
Source19: %{name}-filenamepatterns.txt
@@ -62,9 +61,6 @@
Patch13: %{name}-s390ands390x.patch
# Stupid spaces in directories ...
Patch14: %{name}-s390ands390x2.patch
-# Make find work. See
-# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=111736
-#Patch16: %{name}-find.patch
# Build swttools.jar
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
Patch18: %{name}-swttools.patch
@@ -97,9 +93,6 @@
Patch37: %{name}-gre64.conf.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001
Patch38: %{name}-helpindexbuilder.patch
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=111299
-Patch39: %{name}-e.o111299.patch
-Patch40: %{name}-usebuiltlauncher.patch
# Build cairo libs
# Again, I hate patches with spaces in the filenames
Patch41: %{name}-libswt-cairo1.0-1.patch
@@ -328,17 +321,14 @@
%patch0 -p0
%patch11 -p0
%if %{gcj_support}
-%patch14 -p0
+#%patch14 -p0
%endif
popd
%patch2 -p0
%patch4 -p0
%patch5 -p0
%if %{gcj_support}
-%patch13 -p0
-%endif
-%if %{gcj_support}
-#%patch16 -p0
+#%patch13 -p0
%endif
pushd plugins/org.eclipse.swt.gtk.linux.x86_64
%patch18 -p0
@@ -384,10 +374,6 @@
%patch35 -p0
%patch36 -p1
%patch38 -p0
-pushd plugins
-%patch39 -p0
-popd
-%patch40 -p0
# Again, I hate spaces in patches
pushd plugins/org.eclipse.swt/Eclipse\ SWT/
%patch41 -p0
@@ -1032,8 +1018,8 @@
%if %{gcj_support}
# Native bits
%dir %{_libdir}/gcj/%{name}
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.db
%{_bindir}/ecj
%endif
@@ -1054,8 +1040,8 @@
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/org.eclipse.jface_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.jface_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.1.jar.so
%endif
@@ -1064,12 +1050,12 @@
%{_bindir}/efj
%if %{gcj_support}
# Native bits
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.2.jar.so
%{_libdir}/gcj/%{name}/junitruntime.jar.db
%{_libdir}/gcj/%{name}/junitruntime.jar.so
%{_libdir}/gcj/%{name}/junitsupport.jar.db
@@ -1097,8 +1083,8 @@
%{_libdir}/gcj/%{name}/org.eclipse.pde.core_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.2.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.pde_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.pde_3.1.0.jar.db
%endif
@@ -1153,14 +1139,14 @@
%{_libdir}/gcj/%{name}/org.eclipse.core.commands_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.core.expressions_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.core.expressions_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.0.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.core.variables_3.1.0.jar.db
@@ -1181,14 +1167,14 @@
%{_libdir}/gcj/%{name}/webapp.jar.so
%{_libdir}/gcj/%{name}/tomcatwrapper.jar.db
%{_libdir}/gcj/%{name}/tomcatwrapper.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.browser_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.browser_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.0.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.editors_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.editors_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_3.1.1.jar.db
@@ -1203,36 +1189,36 @@
%{_libdir}/gcj/%{name}/org.eclipse.ui.presentations.r21_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.views_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.views_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.2.jar.so
%{_libdir}/gcj/%{name}/compatibility.jar.db
%{_libdir}/gcj/%{name}/compatibility.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.update.configurator_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.update.configurator_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.update.ui_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.update.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.osgi.util_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.osgi.util_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ant.core_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ant.core_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.2.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.compare_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.compare_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.2.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ltk.core.refactoring_3.1.0.jar.so
@@ -1253,8 +1239,8 @@
%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.team.ui_3.1.1.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.team.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.2.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.text_3.1.1.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.text_3.1.1.jar.db
%endif
@@ -1262,9 +1248,13 @@
%files platform-devel
%{_datadir}/%{name}/plugins/org.eclipse.platform.source_3.*
%{_datadir}/%{name}/features/org.eclipse.platform.source_3.*
-%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
+%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
%changelog
+* Tue Jan 31 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_1fc
+- 3.1.2.
+- Remove unnecessary patches.
+
* Tue Jan 31 2006 Karsten Hopp <karsten at redhat.de>
- BuildRequire: unzip
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources 13 Dec 2005 04:57:49 -0000 1.31
+++ sources 1 Feb 2006 15:32:50 -0000 1.32
@@ -1,2 +1,2 @@
-0d78d5f8afe767014a1cc69ee8c20869 eclipse-sourceBuild-srcIncluded-3.1.1.zip
-0c2a9c7c9f8c6cd1e7264dd0be801d66 eclipse-fedora-splash-3.1.1.png
+f2c8066151de14c5ccdf420266ce9f39 eclipse-sourceBuild-srcIncluded-3.1.2.zip
+1ee1e19362e3ee4d3b67a6dea18961de eclipse-fedora-splash-3.1.2.png
--- eclipse-e.o111299.patch DELETED ---
--- eclipse-find.patch DELETED ---
--- eclipse-usebuiltlauncher.patch DELETED ---
More information about the fedora-cvs-commits
mailing list