rpms/eclipse
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix broken eclipse-addfragments.patch

Browse Source
This commit is contained in:
Andrew Overholt 2008-07-22 17:28:14 +00:00
parent 4fd0cfa666
commit 318e2c1e92
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
eclipse-addfragmentsforotherplatforms.patch
View File

@ -1,15 +1,22 @@
diff -up ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml.fragments ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml diff -up ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml.fragments ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml
--- ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml.fragments 2008-07-22 08:48:57.000000000 -0400 --- ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml.fragments 2008-07-22 13:19:59.000000000 -0400
+++ ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2008-07-22 08:53:49.000000000 -0400 +++ ./assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2008-07-22 13:22:04.000000000 -0400
@@ -94,6 +94,8 @@ @@ -101,6 +101,7 @@
<customGather dir="plugins/org.eclipse.update.configurator" projectName="org.eclipse.update.configurator_3.2.200.v20080417" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" /> <customGather dir="plugins/org.eclipse.equinox.preferences" projectName="org.eclipse.equinox.preferences_3.2.200.v20080421-2006" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.equinox.simpleconfigurator" projectName="org.eclipse.equinox.simpleconfigurator_1.0.0.v20080604" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" /> <customGather dir="plugins/org.eclipse.equinox.registry" projectName="org.eclipse.equinox.registry_3.4.0.v20080516-0950" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.swt.gtk.linux.ia64" projectName="org.eclipse.swt.gtk.linux.ia64_3.4.0.HEAD" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" /> <customGather dir="plugins/org.eclipse.equinox.launcher" projectName="org.eclipse.equinox.launcher_1.0.100.v20080509-1800" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
+ <customGather dir="plugins/org.eclipse.equinox.launcher.gtk.linux.ia64" projectName="org.eclipse.equinox.launcher.gtk.linux.ia64_1.0.100.v20080606" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" /> + <customGather dir="plugins/org.eclipse.equinox.launcher.gtk.linux.x86" projectName="org.eclipse.equinox.launcher.gtk.linux.ia64_1.0.100.v20080606" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
+ <customGather dir="plugins/org.eclipse.core.filesystem.linux.ia64" projectName="org.eclipse.core.filesystem.linux.ia64_1.2.0.v20080604-1400" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" /> <customGather dir="plugins/org.eclipse.equinox.http.jetty_1.1.0" projectName="org.eclipse.equinox.http.jetty_1.1.0.v20080425" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.rcp" projectName="org.eclipse.rcp_3.4.0.v20080507" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" /> <customGather dir="plugins/org.eclipse.equinox.http.registry" projectName="org.eclipse.equinox.http.registry_1.0.100.v20080427-0830" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.core.contenttype" projectName="org.eclipse.core.contenttype_3.3.0.v20080604-1400" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" /> <customGather dir="plugins/org.eclipse.equinox.http.servlet" projectName="org.eclipse.equinox.http.servlet_1.0.100.v20080427-0830" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.equinox.app" projectName="org.eclipse.equinox.app_1.1.0.v20080421-2006" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" /> @@ -183,6 +184,7 @@
<customGather dir="plugins/org.eclipse.update.ui" projectName="org.eclipse.update.ui_3.2.100.v20080318" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.ui.workbench.compatibility" projectName="org.eclipse.ui.workbench.compatibility_3.2.0.I20080509-2000" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.update.core.linux" projectName="org.eclipse.update.core.linux_3.2.0.v20080422" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
+ <customGather dir="plugins/org.eclipse.core.filesystem.linux.x86" projectName="org.eclipse.core.filesystem.linux.ia64_1.2.0.v20080604-1400" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.ui.views.properties.tabbed" projectName="org.eclipse.ui.views.properties.tabbed_3.4.0.I20080527-2000" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.core.commands.source" projectName="org.eclipse.core.commands.source_3.4.0.I20080509-2000" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.core.databinding.source" projectName="org.eclipse.core.databinding.source_1.1.0.I20080527-2000" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
@@ -790,6 +792,10 @@ @@ -790,6 +792,10 @@
</antcall> </antcall>
<antcall target="jarUp"> <antcall target="jarUp">

4
eclipse.spec
View File

@ -1,5 +1,8 @@
# TODO: # TODO:
# - update icu4j and jasper to use %%{_libdir}/eclipse and not %%{_datadir}/eclipse after we build 3.4 # - update icu4j and jasper to use %%{_libdir}/eclipse and not %%{_datadir}/eclipse after we build 3.4
# - generate content.xml for > platform sub-sets
# - move > platform bits to dropins/<jdt,pde> along with content.xml for each
# - update ecj-rpmdebuginfo patch
# - look at startup script and launcher patches # - look at startup script and launcher patches
# - get Ganymede update site pre-configured # - get Ganymede update site pre-configured
# - investigate bi-arch requirements # - investigate bi-arch requirements
@ -106,7 +109,6 @@ Patch31: %{name}-ia64-packaging.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=221908 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=221908
# https://bugs.eclipse.org/bugs/attachment.cgi?id=105593 # https://bugs.eclipse.org/bugs/attachment.cgi?id=105593
# FIXME: update bug with this smaller version of the patch
Patch32: %{name}-compilelibs.patch Patch32: %{name}-compilelibs.patch
# 64-bit systems need to generate the 64-bit JNI code first # 64-bit systems need to generate the 64-bit JNI code first
Patch38: %{name}-compilelibs-64bit.patch Patch38: %{name}-compilelibs-64bit.patch