diff --git a/.cvsignore b/.cvsignore index c92210e..eef1518 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,5 @@ eclipse-fileinitializerapp.tar.bz2 org.fedoraproject.ide.feature-1.0.0.zip -eclipse-sourceBuild-srcIncluded-3.3.2.zip -org.fedoraproject.ide.platform-3.3.2.zip +ecf-filetransfer-v20080611-1715.tar.bz2 +eclipse-sourceBuild-srcIncluded-3.4.zip +org.fedoraproject.ide.platform-3.4.0.zip diff --git a/ecf-filetransfer-build.properties b/ecf-filetransfer-build.properties new file mode 100644 index 0000000..64f93a9 --- /dev/null +++ b/ecf-filetransfer-build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/ecf-filetransfer-feature.xml b/ecf-filetransfer-feature.xml new file mode 100644 index 0000000..7b3fb12 --- /dev/null +++ b/ecf-filetransfer-feature.xml @@ -0,0 +1,63 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + + + diff --git a/eclipse-compilelibs.patch b/eclipse-compilelibs.patch new file mode 100644 index 0000000..619adf8 --- /dev/null +++ b/eclipse-compilelibs.patch @@ -0,0 +1,65 @@ +### Eclipse Workspace Patch 1.0 +#P org.eclipse.releng.eclipsebuilder +Index: eclipse/buildConfigs/sdk/srcBuild/build.xml +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/srcBuild/build.xml,v +retrieving revision 1.21 +diff -u -r1.21 build.xml +--- eclipse/buildConfigs/sdk/srcBuild/build.xml 27 May 2008 19:41:03 -0000 1.21 ++++ eclipse/buildConfigs/sdk/srcBuild/build.xml 26 Jun 2008 17:58:02 -0000 +@@ -1,7 +1,7 @@ + + + +- ++ + + + +@@ -71,6 +71,37 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -174,7 +205,7 @@ + + + +- ++ + + + diff --git a/eclipse-config.ini.director b/eclipse-config.ini.director new file mode 100644 index 0000000..46f1367 --- /dev/null +++ b/eclipse-config.ini.director @@ -0,0 +1,91 @@ +# Eclipse runtime configuration file +# This file contains a number of key/value pairs that are merged into the +# System properties on system startup. The values control the way the +# runtime is structured and runs. + +# Note: Only platform:/base/ and file: URLs are supported. In general the +# URLs given may include a version number (e.g., .../location_1.2.3). +# If a version is not specified, the system binds +# to the location which matches exactly or to the versioned location with the +# latest version number. If a version number is given then only exact matches +# are considered. + +# The URL for the runtime entry point. The default value is +# platform:/base/plugins/org.eclipse.osgi +#osgi.framework=platform:/base/plugins/org.eclipse.osgi + +# The classpath for the framework found at the osgi.framework location. This +# comma-separated list contains either URLs or simple element names. Simple +# names are assumed to be relative to the framework's install directory. +# Typically this value need not be set as it is initialized by the framework itself. +# Version match searching is not done for URLs listed here. +#osgi.frameworkClassPath = + +# The comma-separated list of locations to search for the splash screen file (splash.bmp). +# For each list element a subdirectory structure based on the pattern nl/ is searched. +# The system binds to the first matching file. There is no default value. +#osgi.splashPath= + +# The location of the splash screen file. If this value is set at system startup it is used +# in favour of the osgi.splashPath searching outlined above. If the value is not set +# the searching is done and this key is bound to the result of the search. +#osgi.splashLocation = + +# The comma-separated list of bundles which are automatically installed and optionally started +# once the system is up and running. Each entry if of the form +# [@ [] [":start"]] +# If the startlevel is omitted then the framework will use the default start level for the bundle. +# If the "start" tag is added then the bundle will be marked as started after being installed. +# Simple bundle locations are interepreted as relative to the framework's parent directory. +# The startlevel indicates the OSGi start level at which the bundle should run. +osgi.bundles=\ + org.eclipse.core.jobs,\ + org.eclipse.core.net,\ + org.eclipse.core.runtime,\ + org.eclipse.core.runtime.compatibility.auth,\ + org.eclipse.ecf,\ + org.eclipse.ecf.filetransfer,\ + org.eclipse.ecf.identity,\ + org.eclipse.ecf.provider.filetransfer,\ + org.eclipse.equinox.app@start,\ + org.eclipse.equinox.common,\ + org.eclipse.equinox.frameworkadmin,\ + org.eclipse.equinox.frameworkadmin.equinox@start,\ + org.eclipse.equinox.preferences,\ + org.eclipse.equinox.p2.artifact.repository,\ + org.eclipse.equinox.p2.console,\ + org.eclipse.equinox.p2.core,\ + org.eclipse.equinox.p2.director,\ + org.eclipse.equinox.p2.director.app,\ + org.eclipse.equinox.p2.engine,\ + org.eclipse.equinox.p2.exemplarysetup@start,\ + org.eclipse.equinox.p2.garbagecollector,\ + org.eclipse.equinox.p2.metadata,\ + org.eclipse.equinox.p2.metadata.repository,\ + org.eclipse.equinox.p2.touchpoint.eclipse,\ + org.eclipse.equinox.p2.touchpoint.natives,\ + org.eclipse.equinox.preferences,\ + org.eclipse.equinox.registry,\ + org.eclipse.equinox.simpleconfigurator,\ + org.eclipse.equinox.simpleconfigurator.manipulator@start,\ + org.eclipse.osgi.services,\ + org.sat4j.core,\ + org.sat4j.pb + +org.eclipse.update.reconcile=false + +# The product to run. A given Eclipse configuration may contain many products. +# The product identified will supply the branding (window icons, title bar text) etc +# as well as define the default application to run. +#eclipse.product= + +# The application to run. The value specified here is the id of the application extension +# the runtime will find, instantiate and execute once the system is up. Note that typically +# the identified eclipse.product defines the default application to run. +#eclipse.application= + +# The build identifier +eclipse.buildId=@build@ + +# End of file marker - must be here +eof=eof \ No newline at end of file diff --git a/eclipse-dontpackicu4jsource.patch b/eclipse-dontpackicu4jsource.patch new file mode 100644 index 0000000..399f138 --- /dev/null +++ b/eclipse-dontpackicu4jsource.patch @@ -0,0 +1,20 @@ +diff -up features/org.eclipse.help.source/build.properties.dontpackicu4jsource features/org.eclipse.help.source/build.properties +--- features/org.eclipse.help.source/build.properties.dontpackicu4jsource 2008-07-08 11:17:59.000000000 -0400 ++++ features/org.eclipse.help.source/build.properties 2008-07-08 11:18:35.000000000 -0400 +@@ -15,5 +15,5 @@ feature.xml,\ + feature.properties,\ + license.html + +-generate.feature@org.eclipse.rcp.source = org.eclipse.rcp,plugin@com.ibm.icu.source;version=3.8.1.qualifier;unpack="false" ++generate.feature@org.eclipse.rcp.source = org.eclipse.rcp,plugin@com.ibm.icu.source;version=3.8.1.qualifier + +diff -up features/org.eclipse.help/sourceTemplateFeature/build.properties.dontpackicu4jsource features/org.eclipse.help/sourceTemplateFeature/build.properties +--- features/org.eclipse.help/sourceTemplateFeature/build.properties.dontpackicu4jsource 2008-07-08 11:18:12.000000000 -0400 ++++ features/org.eclipse.help/sourceTemplateFeature/build.properties 2008-07-08 11:18:32.000000000 -0400 +@@ -15,5 +15,5 @@ feature.xml,\ + feature.properties,\ + license.html + +-generate.feature@org.eclipse.rcp.source = org.eclipse.rcp,plugin@com.ibm.icu.source;version=3.8.1.qualifier;unpack="false" ++generate.feature@org.eclipse.rcp.source = org.eclipse.rcp,plugin@com.ibm.icu.source;version=3.8.1.qualifier + diff --git a/eclipse-ecf-qualifier.patch b/eclipse-ecf-qualifier.patch new file mode 100644 index 0000000..c538c8d --- /dev/null +++ b/eclipse-ecf-qualifier.patch @@ -0,0 +1,72 @@ +diff -up plugins/org.eclipse.ecf.core.identity/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf.core.identity/META-INF/MANIFEST.MF +--- plugins/org.eclipse.ecf.core.identity/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:54:07.000000000 -0400 ++++ plugins/org.eclipse.ecf.core.identity/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400 +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %plugin.name + Bundle-SymbolicName: org.eclipse.ecf.identity;singleton:=true +-Bundle-Version: 2.0.0.qualifier ++Bundle-Version: 2.0.0.v20080611-1715 + Bundle-Activator: org.eclipse.ecf.internal.core.identity.Activator + Bundle-Localization: plugin + Bundle-Vendor: %plugin.provider +diff -up plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF +--- plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:56:01.000000000 -0400 ++++ plugins/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400 +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %plugin.name + Bundle-SymbolicName: org.eclipse.ecf.filetransfer;singleton:=true +-Bundle-Version: 2.0.0.qualifier ++Bundle-Version: 2.0.0.v20080611-1715 + Bundle-Activator: org.eclipse.ecf.internal.filetransfer.Activator + Bundle-Vendor: %plugin.provider + Eclipse-LazyStart: true +diff -up plugins/org.eclipse.ecf/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf/META-INF/MANIFEST.MF +--- plugins/org.eclipse.ecf/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:56:00.000000000 -0400 ++++ plugins/org.eclipse.ecf/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400 +@@ -1,7 +1,7 @@ + Manifest-Version: 1.0 + Bundle-Name: %plugin.name + Bundle-SymbolicName: org.eclipse.ecf;singleton:=true +-Bundle-Version: 2.0.0.qualifier ++Bundle-Version: 2.0.0.v20080611-1715 + Bundle-Activator: org.eclipse.ecf.internal.core.ECFPlugin + Bundle-Vendor: %plugin.provider + Bundle-Localization: plugin +diff -up plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF +--- plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:56:01.000000000 -0400 ++++ plugins/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400 +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %plugin.name + Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer;singleton:=true +-Bundle-Version: 2.0.0.qualifier ++Bundle-Version: 2.0.0.v20080611-1715 + Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.Activator + Bundle-Vendor: %plugin.provider + Bundle-Localization: plugin +diff -up plugins/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF +--- plugins/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:56:00.000000000 -0400 ++++ plugins/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400 +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %plugin.name + Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.ssl +-Bundle-Version: 1.0.0.qualifier ++Bundle-Version: 1.0.0.v20080611-1715 + Bundle-Vendor: %plugin.provider + Fragment-Host: org.eclipse.ecf.provider.filetransfer;bundle-version="2.0.0" + Bundle-RequiredExecutionEnvironment: J2SE-1.4 +diff -up plugins/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF.qualifier plugins/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF +--- plugins/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF.qualifier 2008-07-07 15:56:01.000000000 -0400 ++++ plugins/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF 2008-07-07 15:56:20.000000000 -0400 +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %plugin.name + Bundle-SymbolicName: org.eclipse.ecf.ssl +-Bundle-Version: 1.0.0.qualifier ++Bundle-Version: 1.0.0.v20080611-1715 + Fragment-Host: org.eclipse.ecf;bundle-version="2.0.0" + Bundle-RequiredExecutionEnvironment: J2SE-1.4 + Import-Package: org.eclipse.osgi.service.security;version="1.0.0", diff --git a/eclipse-memorypermsizeandjvmcrash.patch b/eclipse-memorypermsizeandjvmcrash.patch index 512bff9..7666244 100644 --- a/eclipse-memorypermsizeandjvmcrash.patch +++ b/eclipse-memorypermsizeandjvmcrash.patch @@ -1,11 +1,17 @@ -diff -ur features/org.eclipse.platform/gtk/eclipse.ini patched/features/org.eclipse.platform/gtk/eclipse.ini ---- features/org.eclipse.platform/gtk/eclipse.ini 2008-04-25 12:25:26.000000000 -0400 -+++ features/org.eclipse.platform/gtk/eclipse.ini 2008-04-25 12:26:04.000000000 -0400 -@@ -2,4 +2,6 @@ - org.eclipse.platform +### Eclipse Workspace Patch 1.0 +#P org.eclipse.platform-feature +Index: gtk/eclipse.ini +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.platform-feature/gtk/eclipse.ini,v +retrieving revision 1.3 +diff -u -r1.3 eclipse.ini +--- gtk/eclipse.ini 3 Jun 2008 20:55:37 -0000 1.3 ++++ gtk/eclipse.ini 8 Jul 2008 19:51:57 -0000 +@@ -4,4 +4,5 @@ + 256m -vmargs -Xms40m --Xmx256m +-Xmx512m +-XX:MaxPermSize=128m -+-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith +\ No newline at end of file diff --git a/eclipse-nojarsignatures.patch b/eclipse-nojarsignatures.patch new file mode 100644 index 0000000..0f732f2 --- /dev/null +++ b/eclipse-nojarsignatures.patch @@ -0,0 +1,205 @@ +diff -up plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsignatures plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF +--- plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF.nojarsignatures 2008-07-08 17:20:06.000000000 -0400 ++++ plugins/org.apache.ant_1.7.0.v200803061910/META-INF/MANIFEST.MF 2008-07-08 17:20:19.000000000 -0400 +@@ -57,178 +57,3 @@ Export-Package: images,org.apache.tools. + .ant.util.optional,org.apache.tools.ant.util.regexp,org.apache.tools. + bzip2,org.apache.tools.mail,org.apache.tools.tar,org.apache.tools.zip + Require-Bundle: org.eclipse.osgi +- +-Name: lib/ant-apache-bsf.jar +-SHA1-Digest: cLbTh5sinbLWGWUDCS84n0i2a0E= +- +-Name: lib/ant-trax.jar +-SHA1-Digest: 3HKcsIRJKPlrfuIaJUDOtGEndrg= +- +-Name: etc/maudit-frames.xsl +-SHA1-Digest: BIZGVBGe+t+oL7NBTtnF6SSR2UI= +- +-Name: bin/lcp.bat +-SHA1-Digest: tVZ9b7fPb0VxK6VtxdbHL/Snslc= +- +-Name: bin/runrc.cmd +-SHA1-Digest: tEBZS6nXZrF77Q5oOO0NyffnU28= +- +-Name: etc/jdepend.xsl +-SHA1-Digest: OMznHreSkSUr+5YOtNAlZZLjZWQ= +- +-Name: bin/antenv.cmd +-SHA1-Digest: 2NIxw+ojKZeK7CNeLtrR7kFNG2E= +- +-Name: about_files/LICENSE.sax.txt +-SHA1-Digest: uLnQn2qwT77aJ6MThuLeWz1I5ek= +- +-Name: META-INF/eclipse.inf +-SHA1-Digest: u+F8j/GAE8tzrDry9+wT3Cvg81Y= +- +-Name: lib/ant-launcher.jar +-SHA1-Digest: GPILSOan10oQR0XsnIUpAkN3hW8= +- +-Name: lib/ant-apache-bcel.jar +-SHA1-Digest: 249vQWKFKUpoY2wsy/gVYRVQA9Y= +- +-Name: lib/ant-antlr.jar +-SHA1-Digest: sUjnJ2scpExnqFt7w3wTrxPBzMw= +- +-Name: etc/changelog.xsl +-SHA1-Digest: qhlQEgDDZI8YGnD/Lo/OLLdpwE4= +- +-Name: etc/jdepend-frames.xsl +-SHA1-Digest: ziSyDJrI6CYzulVP7xbFuMAk62w= +- +-Name: lib/ant-starteam.jar +-SHA1-Digest: /E3ouEPkRPL3WBvefzGRsck5lmc= +- +-Name: about.html +-SHA1-Digest: N0elfKP7uYuYLATOh5XaE1P3nXI= +- +-Name: lib/ant-jai.jar +-SHA1-Digest: MamtbKiOfCYyaKLBsNuL7HdasTA= +- +-Name: lib/ant-junit.jar +-SHA1-Digest: vKM3lSYbY8hlxKv/eh48EzoMr4s= +- +-Name: lib/ant-swing.jar +-SHA1-Digest: h89jil3YSxk/sLy8HZubQDaqZZA= +- +-Name: lib/ant-apache-log4j.jar +-SHA1-Digest: yo4BWxFzGJvFGlwAa9+lqooG+iE= +- +-Name: bin/ant +-SHA1-Digest: 1hZ7I8ryxuQA8ffu95k409JSpxM= +- +-Name: bin/ant.cmd +-SHA1-Digest: YDWS/zHHaPn0kEZm/Az4+vJLzKI= +- +-Name: lib/ant-commons-net.jar +-SHA1-Digest: cW0crWNYgqgbNuezMwOUzY9ysfY= +- +-Name: lib/ant-jsch.jar +-SHA1-Digest: 2cWHrQfYXqJ6Ox5ESC+vnLUmKTQ= +- +-Name: lib/ant-netrexx.jar +-SHA1-Digest: L+voULB0JY9SHKXVQJ1LDHn7bUI= +- +-Name: etc/checkstyle/checkstyle-text.xsl +-SHA1-Digest: v7HDzjT8VIMoo9nbczMpQ4R89OA= +- +-Name: lib/ant-jdepend.jar +-SHA1-Digest: l8MtENBefa2/Xp24qA+J9a93YIM= +- +-Name: lib/ant-stylebook.jar +-SHA1-Digest: uQZ41IjyE1tK965YSxsqP+jqK0c= +- +-Name: about_files/NOTICE +-SHA1-Digest: Mu3gQHJl963VZJ+BCE906ZAhmXY= +- +-Name: etc/coverage-frames.xsl +-SHA1-Digest: CuWmV380G7/H3FRwPp+feAg9d7E= +- +-Name: lib/ant-nodeps.jar +-SHA1-Digest: o5euDnSx3TKUufdhqOcdd85RM20= +- +-Name: bin/complete-ant-cmd.pl +-SHA1-Digest: u8SyqqLh5SyqEPe8brM/glCglQo= +- +-Name: about_files/LICENSE.dom.html +-SHA1-Digest: 9F8cZaCgriCte0T6Mt5hAFumadk= +- +-Name: etc/tagdiff.xsl +-SHA1-Digest: QvXTkg9jgfgCMbm/Idqk/uNf4dI= +- +-Name: etc/junit-frames.xsl +-SHA1-Digest: wSBQFHcXT1XjHPWfk41j8XH1qeQ= +- +-Name: lib/ant-weblogic.jar +-SHA1-Digest: J6F+0H7fONfNWUCwSqb+7IK3Rkc= +- +-Name: lib/ant-jmf.jar +-SHA1-Digest: NGPXYqQRsREHJe8qsEyPAg2RUAM= +- +-Name: bin/ant.bat +-SHA1-Digest: p0LkZEyD/pMRF8Uo9Hxte58B9dI= +- +-Name: plugin.properties +-SHA1-Digest: iQO3hlGZf45g3Y7ajtCmCUjMq30= +- +-Name: etc/checkstyle/checkstyle-xdoc.xsl +-SHA1-Digest: Zkz4ykfgxadN8RCiCtVrI46bzu4= +- +-Name: lib/ant.jar +-SHA1-Digest: AyMypsce7YssTu3t0qKPuArssCw= +- +-Name: lib/ant-javamail.jar +-SHA1-Digest: EYOAc6WEA+Pj8MPPoa1W8neE1DQ= +- +-Name: lib/ant-apache-resolver.jar +-SHA1-Digest: /bhh3PxZKpcm4EmiQRsOw81aHlI= +- +-Name: bin/antRun +-SHA1-Digest: HXlDrtLiLYQs4XkPbksH6PzmiQ4= +- +-Name: bin/envset.cmd +-SHA1-Digest: nJW9gBVUQczlMJmAog4nH2yNp98= +- +-Name: bin/antRun.pl +-SHA1-Digest: 1ZjEo56V249cfnPSBpzjYNRTLys= +- +-Name: etc/mmetrics-frames.xsl +-SHA1-Digest: +ueQIFM6aBe6Ifc8PrZ7F4Migyk= +- +-Name: etc/checkstyle/checkstyle-frames.xsl +-SHA1-Digest: aeITXtUk9Yia5TTVXOd6qfMmPTM= +- +-Name: lib/ant-apache-oro.jar +-SHA1-Digest: WJ++owyMbcVbY3kBJgq2oNNGsCU= +- +-Name: bin/antRun.bat +-SHA1-Digest: d765puLLhb82dE5NC5YNCn6DpeA= +- +-Name: etc/junit-noframes.xsl +-SHA1-Digest: 8O4YCYnt5a6gbrMsIigvW/4GV4g= +- +-Name: bin/runant.pl +-SHA1-Digest: RPsWXDGHzbNBGD/i6pTGtQFJ6oY= +- +-Name: about_files/asl-v20.txt +-SHA1-Digest: K4uBUimqimHkg/tLoFiLi2xJGJA= +- +-Name: etc/junit-frames-xalan1.xsl +-SHA1-Digest: blbb8jE6V2zTzRGjvVaXL5fPicM= +- +-Name: etc/log.xsl +-SHA1-Digest: ulVeGl+WSkbjGbHF7LGA8Csuh/0= +- +-Name: lib/ant-commons-logging.jar +-SHA1-Digest: Vvp4W/tusjWem5gN4Y1cMVAJGck= +- +-Name: lib/ant-apache-regexp.jar +-SHA1-Digest: HQscc3xTxU2HKsoh8YlyUPpsr/Q= +- +-Name: bin/runant.py +-SHA1-Digest: ptbC0mx7ZARrg/FG64aqqikvS2A= +- +diff -up plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF.nojarsignatures plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF +--- plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF.nojarsignatures 2008-07-08 17:19:51.000000000 -0400 ++++ plugins/org.junit_3.8.2.v20080602-1318/META-INF/MANIFEST.MF 2008-07-08 17:20:22.000000000 -0400 +@@ -11,19 +11,3 @@ Export-Package: junit.awtui;version="3.8 + 3.8.2",junit.framework;version="3.8.2",junit.runner;version="3.8.2",j + unit.swingui;version="3.8.2",junit.swingui.icons;version="3.8.2",juni + t.textui;version="3.8.2" +- +-Name: junit.jar +-SHA1-Digest: puYpCZFqVfqSN4lDihSuym3cJ00= +- +-Name: plugin.properties +-SHA1-Digest: mL9yvXBmAAJi7G1tls7akuyPG+A= +- +-Name: about.html +-SHA1-Digest: UFe6k4Ad9XpZmuWF46WW3vk9dVA= +- +-Name: META-INF/eclipse.inf +-SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw= +- +-Name: about_files/cpl-v10.html +-SHA1-Digest: o0b19ceZ+HQHVX0Ops751AQVdwM= +- diff --git a/eclipse-pdeapicasting-ui.patch b/eclipse-pdeapicasting-ui.patch new file mode 100644 index 0000000..0634a4a --- /dev/null +++ b/eclipse-pdeapicasting-ui.patch @@ -0,0 +1,18 @@ +### Eclipse Workspace Patch 1.0 +#P org.eclipse.pde.api.tools.ui +Index: src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiProfileWizardPage.java +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiProfileWizardPage.java,v +retrieving revision 1.25 +diff -u -r1.25 ApiProfileWizardPage.java +--- src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiProfileWizardPage.java 22 May 2008 15:36:51 -0000 1.25 ++++ src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiProfileWizardPage.java 26 Jun 2008 14:12:52 -0000 +@@ -309,7 +309,7 @@ + } + Collections.sort(items, new Comparator() { + public int compare(Object o1, Object o2) { +- return ((String)o1).compareTo(o2); ++ return ((String)o1).compareTo((String) o2); + } + }); + diff --git a/eclipse-pdeapicasting.patch b/eclipse-pdeapicasting.patch new file mode 100644 index 0000000..1c7bc9d --- /dev/null +++ b/eclipse-pdeapicasting.patch @@ -0,0 +1,34 @@ +### Eclipse Workspace Patch 1.0 +#P org.eclipse.pde.api.tools +Index: src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java,v +retrieving revision 1.3 +diff -u -r1.3 DeltaReportConversionTask.java +--- src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java 14 May 2008 15:02:51 -0000 1.3 ++++ src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java 26 Jun 2008 13:56:12 -0000 +@@ -288,7 +288,7 @@ + public int compare(Object o1, Object o2) { + Map.Entry entry1 = (Map.Entry) o1; + Map.Entry entry2 = (Map.Entry) o2; +- return ((String) entry1.getKey()).compareTo(entry2.getKey()); ++ return ((String) entry1.getKey()).compareTo((String) entry2.getKey()); + } + }); + for (Iterator iterator = allEntries.iterator(); iterator.hasNext(); ) { +Index: src_ant/org/eclipse/pde/api/tools/internal/tasks/APIToolsVerificationTask.java +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIToolsVerificationTask.java,v +retrieving revision 1.8 +diff -u -r1.8 APIToolsVerificationTask.java +--- src_ant/org/eclipse/pde/api/tools/internal/tasks/APIToolsVerificationTask.java 26 May 2008 19:59:29 -0000 1.8 ++++ src_ant/org/eclipse/pde/api/tools/internal/tasks/APIToolsVerificationTask.java 26 Jun 2008 13:56:12 -0000 +@@ -656,7 +656,7 @@ + public int compare(Object o1, Object o2) { + Map.Entry entry1 = (Map.Entry) o1; + Map.Entry entry2 = (Map.Entry) o2; +- return ((String) entry1.getKey()).compareTo(entry2.getKey()); ++ return ((String) entry1.getKey()).compareTo((String) entry2.getKey()); + } + }); + Summary[] summaries = new Summary[size]; diff --git a/eclipse.in b/eclipse.in index e48984f..5288e7d 100644 --- a/eclipse.in +++ b/eclipse.in @@ -1,6 +1,4 @@ #!/bin/sh exec @LIBDIR@/eclipse/eclipse \ - --launcher.library @LIBDIR@/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux.@ECLIPSELIBSUFFIX@ \ - -startup /usr/share/eclipse/startup.jar \ ${1+"$@"} diff --git a/eclipse.spec b/eclipse.spec index d219a17..36dc987 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,14 +1,14 @@ +# TODO: +# - update icu4j and jasper to use %%{_libdir}/eclipse and not %%{_datadir}/eclipse after we build 3.4 +# - look at startup script and launcher patches +# - update stuff for building on secondary arches Epoch: 1 -%define gcj_support 1 -%define tomcatsharedir %{_datadir}/tomcat5 -%define tomcatlibdir %{_var}/lib/tomcat5 %define eclipse_major 3 -%define eclipse_minor 3 +%define eclipse_minor 4 %define eclipse_majmin %{eclipse_major}.%{eclipse_minor} -%define eclipse_micro 2 -%define libname libswt3 -%define swtver 3.3.2.v3349 +%define eclipse_micro 0 +%define swtver 3.4.0.v3448f # All arches line up between Eclipse and Linux kernel names except i386 -> x86 %ifarch %{ix86} @@ -20,17 +20,17 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 13%{?dist} +Release: 1%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ -Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.3.2-200802211800/eclipse-sourceBuild-srcIncluded-3.3.2.zip +Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/eclipse-sourceBuild-srcIncluded-3.4.zip Source2: %{name}.desktop -Source3: eclipse.in +#Source3: eclipse.in # cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \ -# -r fedoraeclipse-3_3_2 branding/org.fedoraproject.ide.platform +# -r fedoraeclipse-3_4_0 branding/org.fedoraproject.ide.platform # cd branding -# zip -r org.fedoraproject.ide.platform-3.3.2.zip \ +# zip -r org.fedoraproject.ide.platform-3.4.0.zip \ # org.fedoraproject.ide.platform Source4: org.fedoraproject.ide.platform-%{version}.zip # cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \ @@ -51,9 +51,19 @@ Source19: %{name}-filenamepatterns.txt Source20: %{name}-fileinitializerapp.tar.bz2 # Script to wrap PDE Build calls for bundle builds Source21: %{name}-pdebuild.sh +# config.ini to run the director for provisioning the installation +Source22: %{name}-config.ini.director +Source24: fetch-ecf.sh +# This was fetched using the above script. +# We will eventually have an eclipse-ecf package but since the ECF +# filetransfer bits that are part of the SDK actually require the SDK >= +# 3.4 to build, I'm going to build them here and have them be owned by +# the SDK packages for now. -- overholt, 2008-07-07 +Source25: ecf-filetransfer-v20080611-1715.tar.bz2 +# Create a simple feature for building ECF's filetransfer plugins +Source26: ecf-filetransfer-feature.xml +Source27: ecf-filetransfer-build.properties -# This needs to go upstream -Patch3: %{name}-libupdatebuild2.patch # Build swttools.jar # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364 Patch4: %{name}-swttools.patch @@ -62,29 +72,23 @@ Patch4: %{name}-swttools.patch # 2. ensures that the OSGi configuration directory # (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 +#Patch12: %{name}-launcher-set-install-dir-and-shared-config.patch # Always generate debug info when building RPMs (Andrew Haley) # This needs to be investigated for getEnv changes -Patch14: %{name}-ecj-rpmdebuginfo.patch +# FIXME: update this patch to avoid fuzz +#Patch14: %{name}-ecj-rpmdebuginfo.patch # generic releng plugins that can be used to build plugins # see this thread for details: # https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html Patch15: %{name}-pde.build-add-package-build.patch -# This tomcat stuff will change when they move to the equinox jetty provider -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371 -Patch6: %{name}-tomcat55.patch -Patch7: %{name}-tomcat55-build.patch # Use ecj for gcj -Patch17: %{name}-ecj-gcj.patch -Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch -Patch28: %{name}-add-ppc64-sparc64-s390-s390x-2.patch -Patch30: %{name}-addfragmentsforotherplatforms.patch +#Patch17: %{name}-ecj-gcj.patch +#Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch +#Patch28: %{name}-add-ppc64-sparc64-s390-s390x-2.patch +#Patch30: %{name}-addfragmentsforotherplatforms.patch #FIXME: file a bug upstream Patch26: %{name}-launcher-fix-java-home.patch -# On a 1.7 VM, generate 1.6-level bytecode -# https://bugzilla.redhat.com/show_bug.cgi?id=288991 -Patch27: %{name}-17vmgenerate16bytecode.patch -# Default max heap size too low for lots of people. Bumping to 512 MB. +# Default max heap size too low for lots of people. Bump to 512 MB. # Max perm size: # https://bugzilla.redhat.com/show_bug.cgi?id=352361 # JVM crash: @@ -92,22 +96,28 @@ Patch27: %{name}-17vmgenerate16bytecode.patch # https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092 Patch29: %{name}-memorypermsizeandjvmcrash.patch -Patch31: %{name}-ia64-packaging.patch -# https://bugs.eclipse.org/226356 -# Note: I made this patch from within Eclipse and then did the following to -# it due to spaces in the paths: -# sed --in-place "s/Eclipse\ SWT\ PI/Eclipse_SWT_PI/g" eclipse-buildagainstxulrunner.patch -Patch32: %{name}-buildagainstxulrunner.patch - -# Back-port from 3.4 -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=206432 -# https://bugzilla.redhat.com/show_bug.cgi?id=446064 -# Note: I made this patch from within Eclipse and then did the following to -# it due to spaces in the paths: -# sed --in-place \ -# "s/Eclipse\ SWT\ Mozilla/Eclipse_SWT_Mozilla/g;s/Eclipse\ SWT/Eclipse_SWT/g" \ -# eclipse-swt-mozprofile.patch -Patch33: %{name}-swt-mozprofile.patch +#Patch31: %{name}-ia64-packaging.patch + +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=221908 +# https://bugs.eclipse.org/bugs/attachment.cgi?id=105593 +# FIXME: update bug with this smaller version of the patch +Patch32: %{name}-compilelibs.patch + +# FIXME: file these upstream +# Upstream builds with a 1.4 (or lower) class library +Patch33: %{name}-pdeapicasting.patch +Patch34: %{name}-pdeapicasting-ui.patch + +# Make ECF bundles have the same qualifier as they do upstream +Patch35: %{name}-ecf-qualifier.patch + +# Don't pack the icu4j source bundle. Can go away when we re-build +# icu4j against a 3.4 SDK. +Patch36: %{name}-dontpackicu4jsource.patch + +# Our dependent JARs have different signatures than the ones included +# upstream so remove the signatures in the manifests +Patch37: %{name}-nojarsignatures.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant @@ -126,18 +136,10 @@ BuildRequires: mesa-libGLU-devel BuildRequires: cairo >= 1.0 BuildRequires: unzip BuildRequires: icu4j-eclipse >= 3.6.1-1jpp.4 -BuildRequires: tomcat5-jasper-eclipse >= 5.5.17 BuildRequires: desktop-file-utils -%if %{gcj_support} -BuildRequires: gcc-java >= 4.1.2 -BuildRequires: java-1.5.0-gcj-javadoc -BuildRequires: java-gcj-compat-devel >= 1.0.64 -BuildRequires: libXt-devel -%else BuildRequires: java-devel >= 1.6.0 BuildRequires: java-javadoc BuildRequires: libXt-devel -%endif # Need to investigate why we don't build ant-apache-bsf or ant-commons-net in # Fedora. When that's done, add it here and symlink below. @@ -149,19 +151,14 @@ BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-com BuildRequires: jakarta-commons-el >= 1.0-8jpp BuildRequires: jakarta-commons-logging >= 1.0.4-6jpp.3 BuildRequires: mx4j >= 2.1 -BuildRequires: tomcat5 >= 5.5.23-9jpp.4 -BuildRequires: tomcat5-jasper >= 5.5.23-9jpp.4 -BuildRequires: tomcat5-servlet-2.4-api >= 5.5.23-9jpp.4 BuildRequires: jetty BuildRequires: lucene >= 1.9.1 BuildRequires: lucene-contrib >= 1.9.1 BuildRequires: regexp BuildRequires: junit >= 3.8.1-3jpp BuildRequires: junit4 -%if %{gcj_support} -Requires(post): java-gcj-compat >= 1.0.64 -Requires(postun): java-gcj-compat >= 1.0.64 -%endif +BuildRequires: sat4j +BuildRequires: objectweb-asm %description The Eclipse Platform is designed for building integrated development @@ -174,74 +171,49 @@ Summary: Eclipse Compiler for Java Group: Development/Languages Obsoletes: ecj < %{version}-%{release} Provides: ecj = %{version}-%{release} -%if %{gcj_support} -Requires: libgcj >= 4.0.2 -Requires(post): java-gcj-compat >= 1.0.64 -Requires(postun): java-gcj-compat >= 1.0.64 -%else Requires: java >= 1.6.0 -%endif %description ecj Eclipse compiler for Java. -%package -n %{libname}-gtk2 +%package swt Summary: SWT Library for GTK+-2.0 Group: Text Editors/Integrated Development Environments (IDE) -%if %{gcj_support} -Requires: libgcj >= 4.0.2 -Requires(post): java-gcj-compat >= 1.0.64 -Requires(postun): java-gcj-compat >= 1.0.64 -%endif # %{_libdir}/java directory owned by jpackage-utils Requires: jpackage-utils Requires: gtk2 Requires: gecko-libs >= 1.9 Conflicts: mozilla +Provides: libswt3-gtk2 = 1:%{version}-%{release} +# The 20 is more than the currently (2008-06-25) latest 3.3.2 package +# but I want to leave some room in case we need to do an F9 update. +Obsoletes: libswt3-gtk2 < 1:3.3.2-20 -%description -n %{libname}-gtk2 +%description swt SWT Library for GTK+-2.0. %package rcp Summary: Eclipse Rich Client Platform Group: Development/Languages -Requires: %{libname}-gtk2 = %{epoch}:%{version}-%{release} -# This file-level requirement is for the bi-arch multilib case -Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar -Requires(post): %{libname}-gtk2 = %{epoch}:%{version}-%{release} -Requires(postun): %{libname}-gtk2 = %{epoch}:%{version}-%{release} +Requires: %{name}-swt = %{epoch}:%{version}-%{release} +# FIXME: investigate. Can we just add a %{arch} to the above? +## This file-level requirement is for the bi-arch multilib case +#Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar +Requires(post): %{name}-swt = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-swt = %{epoch}:%{version}-%{release} Requires: icu4j-eclipse >= 3.6.1-1jpp.4 -%if %{gcj_support} -Requires: libgcj >= 4.0.2 -Requires(post): java-gcj-compat >= 1.0.64 -Requires(postun): java-gcj-compat >= 1.0.64 -%else Requires: java >= 1.6.0 -%endif %description rcp Eclipse Rich Client Platform -%package cvs-client -Summary: Eclipse CVS Client -Group: Text Editors/Integrated Development Environments (IDE) -Requires: %{name}-rcp = %{epoch}:%{version}-%{release} -Requires(post): %{name}-rcp = %{epoch}:%{version}-%{release} -Requires(postun): %{name}-rcp = %{epoch}:%{version}-%{release} - -%description cvs-client -Eclipse CVS Client - %package platform Summary: Eclipse platform common files Group: Text Editors/Integrated Development Environments (IDE) -%if %{gcj_support} -Requires(post): java-gcj-compat >= 1.0.64 -Requires(postun): java-gcj-compat >= 1.0.64 -%endif Requires: %{name}-rcp = %{epoch}:%{version}-%{release} -# This file-level requirement is for the bi-arch multilib case -Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar +# FIXME: investigate. Can we just add a %{arch} to the above? +## This file-level requirement is for the bi-arch multilib case +#Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar Requires(post): %{name}-rcp = %{epoch}:%{version}-%{release} Requires(postun): %{name}-rcp = %{epoch}:%{version}-%{release} # Need to investigate why we don't build ant-apache-bsf or ant-commons-net in @@ -254,16 +226,14 @@ Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons- Requires: jakarta-commons-el >= 1.0-8jpp Requires: jakarta-commons-logging >= 1.0.4-6jpp.3 Requires: mx4j >= 2.1 -Requires: tomcat5 >= 5.5.23-9jpp.4 -Requires: tomcat5-jasper-eclipse >= 5.5.23-9jpp.4 -Requires: tomcat5-servlet-2.4-api >= 5.5.23-9jpp.4 -Requires: tomcat5-jsp-2.0-api >= 5.5.23-9jpp.4 Requires: jetty Requires: jsch >= 0.1.31 Requires: lucene >= 1.9.1 Requires: lucene-contrib >= 1.9.1 Requires: regexp -Requires: eclipse-cvs-client +Requires: sat4j +Provides: eclipse-cvs-client = 1:%{version}-%{release} +Obsoletes: eclipse-cvs-client < 1:3.3.2-20 %description platform The Fedora Eclipse Platform is the base of all IDE plugins. This does not include the @@ -272,7 +242,6 @@ Java Development Tools or the Plugin Development Environment. %package jdt Summary: Eclipse Java Development Tools Group: Text Editors/Integrated Development Environments (IDE) -Provides: eclipse Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-cvs-client = %{epoch}:%{version}-%{release} Requires: %{name}-ecj = %{epoch}:%{version}-%{release} @@ -283,10 +252,6 @@ Requires(postun): %{name}-ecj = %{epoch}:%{version}-%{release} Requires: junit >= 3.8.1-3jpp Requires: junit4 Requires: java-javadoc -%if %{gcj_support} -Requires(post): java-gcj-compat >= 1.0.64 -Requires(postun): java-gcj-compat >= 1.0.64 -%endif %description jdt Eclipse Java Development Tools. This package is required to use Eclipse for @@ -296,21 +261,7 @@ developing software written in the Java programming language. Summary: Eclipse Plugin Development Environment Group: Text Editors/Integrated Development Environments (IDE) Provides: eclipse-sdk -# Can remove for F9 -Obsoletes: eclipse-sdk < 1:3.3.0-13.fc8 -Provides: eclipse-pde-sdk -Obsoletes: eclipse-pde-sdk 1:3.3.0-13.fc8 -Provides: eclipse-cvs-client-sdk -Obsoletes: eclipse-cvs-client-sdk < 1:3.3.0-13.fc8 -Provides: eclipse-jdt-sdk -Obsoletes: eclipse-jdt-sdk < 1:3.3.0-13.fc8 -Provides: eclipse-pde-sdk -Obsoletes: eclipse-pde-sdk < 1:3.3.0-13.fc8 -Provides: eclipse-platform-sdk -Obsoletes: eclipse-platform-sdk < 1:3.3.0-13.fc8 -Provides: eclipse-rcp-sdk -Obsoletes: eclipse-rcp-sdk < 1:3.3.0-13.fc8 -# end remove for F9 +Provides: eclipse Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-jdt = %{epoch}:%{version}-%{release} Requires: %{name}-pde-runtime = %{epoch}:%{version}-%{release} @@ -320,10 +271,7 @@ Requires(post): %{name}-jdt = %{epoch}:%{version}-%{release} Requires(postun): %{name}-jdt = %{epoch}:%{version}-%{release} Requires(post): %{name}-pde-runtime = %{epoch}:%{version}-%{release} Requires(postun): %{name}-pde-runtime = %{epoch}:%{version}-%{release} -%if %{gcj_support} -Requires(post): java-gcj-compat >= 1.0.64 -Requires(postun): java-gcj-compat >= 1.0.64 -%endif +Requires: objectweb-asm # For PDE Build wrapper script Requires: bash @@ -337,10 +285,6 @@ Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires(post): %{name}-platform = %{epoch}:%{version}-%{release} Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release} -%if %{gcj_support} -Requires(post): java-gcj-compat >= 1.0.64 -Requires(postun): java-gcj-compat >= 1.0.64 -%endif %description pde-runtime Eclipse Plugin Development Environment runtime plugin (org.eclipse.pde.runtime). @@ -348,28 +292,18 @@ Eclipse Plugin Development Environment runtime plugin (org.eclipse.pde.runtime). %prep %setup -q -c +%patch32 -p4 + sed --in-place "s/java5.home/java.home/" build.xml -%patch3 -p0 -# FIXME: investigate why we are pushd'ing here # Build swttools.jar pushd plugins/org.eclipse.swt.gtk.linux.x86_64 %patch4 -p0 popd -# tomcat patches -pushd plugins/org.eclipse.tomcat -%patch6 -p0 -%patch7 -p0 -popd -sed --in-place "s/4.1.230/5.5.23/g" \ - features/org.eclipse.platform/build.xml \ - plugins/org.eclipse.tomcat/build.xml \ - plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF \ - assemble.*.xml - -pushd plugins/org.eclipse.jdt.core -%patch17 -p0 -popd +## FIXME: update +#pushd plugins/org.eclipse.jdt.core +#%patch17 -p0 +#popd # liblocalfile fixes sed --in-place "s/JAVA_HOME =/#JAVA_HOME =/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile @@ -378,19 +312,16 @@ sed --in-place "s/OPT_FLAGS=-O/OPT_FLAGS=-O2 -g/" plugins/org.eclipse.core.files # launcher patches rm plugins/org.eclipse.platform/launchersrc.zip pushd features/org.eclipse.equinox.executable -%patch12 -p0 +#%patch12 -p0 %patch26 -p0 -# put the configuration directory in an arch-specific location -sed --in-place "s:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:" library/eclipse.c -# make the eclipse binary relocatable -sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c +# FIXME: deal with this +## put the configuration directory in an arch-specific location +#sed --in-place "s:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:" library/eclipse.c +## make the eclipse binary relocatable +#sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library popd -pushd plugins/org.eclipse.jdt.core -%patch27 -popd - # use our system-installed javadocs sed --in-place "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \ plugins/org.eclipse.platform.doc.isv/platformOptions.txt @@ -401,14 +332,37 @@ sed --in-place "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java plugins/org.eclipse.pde.doc.user/pdeOptions.txt \ plugins/org.eclipse.pde.doc.user/pdeOptions -%patch14 -p0 +#%patch14 -p0 pushd plugins/org.eclipse.pde.build %patch15 -sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" templates/package-build/build.properties +sed --in-place "s:/usr/share/eclipse:%{_libdir}/%{name}:" templates/package-build/build.properties popd -# FIXME this should be patched upstream with a flag to turn on and off +pushd features/org.eclipse.platform +# Move this file around due a bug in the metadata generator/parser that +# can't work with the compiler exclude +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=238240 +cp -p gtk/eclipse.ini{,.orig} +%patch29 +mv gtk/eclipse.ini{,.patched} +mv gtk/eclipse.ini{.orig,} +popd + +pushd plugins/org.eclipse.pde.api.tools +%patch33 +popd +pushd plugins/org.eclipse.pde.api.tools.ui +%patch34 +popd + +%patch36 +%patch37 + +# Remove signatures for JARs +find -iname \*.sf | xargs rm +find -iname \*.rsa | xargs rm + # all output should be directed to stdout # https://bugs.eclipse.org/bugs/show_bug.cgi?id=144942 find -type f -name \*.xml -exec sed --in-place -r "s/output=\".*(txt|log).*\"//g" "{}" \; @@ -417,116 +371,116 @@ find -type f -name \*.xml -exec sed --in-place -r "s/output=\".*(txt|log).*\"//g find -name \*.so | xargs rm find features/org.eclipse.equinox.executable -type f -name eclipse | xargs rm +# FIXME +# +## the swt version is set to HEAD on ia64 but shouldn't be +## get swt version +#SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =) +#SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =) +#SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER +#swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") +#swt_frag_ver_ia64=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") +#sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml \ +# assemble.org.eclipse.sdk.linux.gtk.ia64.xml \ +# features/org.eclipse.rcp/build.xml +# +## Nasty hack to get suppport for ppc64, sparc{,64} and alpha +#%patch24 -p1 +#%patch28 +#%patch30 +#%patch31 -p1 +# +## there is only partial support for ppc64 so we have to remove this +## partial support to get the replacement hack to work +#find -name \*ppc64\* | xargs rm -r +## remove ppc64 support from features/org.eclipse.platform.source/feature.xml +## replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets +#find -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" "{}" \; +## remove org.eclipse.platform.source.linux.gtk.ppc64 +#sed -i "50,54d" features/org.eclipse.platform.source/build.xml +## replace final occurances with an existing arch +#sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml +## Move all of the ia64 directories and files to ppc64 or sparc{,64} or alpha dirs and replace +## the ia64 strings with ppc64 etc. +#%ifarch ppc64 sparc sparcv9 sparc64 alpha +# for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do +# tofile=$(echo $f | sed "s/ia64/%{_arch}/") +# mv $f $tofile +## sed --in-place "s/ia64/%{_arch}/g" $tofile +# done +# OLDIFS=$IFS +#IFS=' +#' +# for f in $(find -type f ! -name \*.java -a ! -name feature.xml -a ! -name \*.gif \ +# -a ! -name \*.png -a ! -name \*.htm* -a ! -name \*.jar -a ! -name \ +# \*.exe -a ! -name \*.pm -a ! -name \*.jpg); do +# sed -i -e "s/ia64_32/@eye-eh-64_32@/g" -e "s/ia64/%{_arch}/g" -e "s/@eye-eh-64_32@/ia64_32/g" $f +# done +# IFS=$OLDIFS +#%endif +# +#%ifarch ppc64 sparc sparcv9 sparc64 alpha ia64 +#IFS=' +#' +# # Copy over the fragments for these arches +# cp -pr plugins/org.eclipse.equinox.launcher.gtk.linux.{ppc,%{_arch}} +# pushd plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch} +# for f in $(find -type f); do +# sed -i -e "s/ppc/%{_arch}/g" $f +# done +# popd +# cp -pr plugins/org.eclipse.core.filesystem.linux.{ppc,%{_arch}} +# pushd plugins/org.eclipse.core.filesystem.linux.%{_arch} +# for f in $(find -type f); do +# sed -i -e "s/ppc/%{_arch}/g" $f +# done +# popd +# IFS=$OLDIFS +#%endif + # Symlinks +rm plugins/org.sat4j* +ln -s %{_javadir}/org.sat4j.core_* plugins/ +ln -s %{_javadir}/org.sat4j.pb_* plugins/ + +ASMPLUGINVERSION=$(ls plugins | grep org.objectweb.asm_ | \ + sed 's/org.objectweb.asm_//') +rm plugins/org.objectweb.asm_$ASMPLUGINVERSION +ln -s %{_javadir}/objectweb-asm/asm-all.jar \ + plugins/org.objectweb.asm_$ASMPLUGINVERSION ## BEGIN ANT ## -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-antlr.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bcel.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bsf.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-log4j.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-oro.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-regexp.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-resolver.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-logging.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-net.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jai.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-javamail.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jdepend.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jmf.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jsch.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-junit.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-launcher.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-netrexx.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-nodeps.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-starteam.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-stylebook.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-swing.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-trax.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-weblogic.jar -# FIXME: use build-jar-repository -ln -s %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-antlr.jar -ln -s %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bcel.jar -#ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bsf.jar -ln -s %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-log4j.jar -ln -s %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-oro.jar -ln -s %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-regexp.jar -ln -s %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-resolver.jar -ln -s %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-logging.jar +ANTDIR=plugins/$(ls plugins | grep org.apache.ant_) +rm $ANTDIR/lib/* +ANTDIR=$ANTDIR/lib +ln -s %{_javadir}/ant/ant-antlr.jar $ANTDIR/ant-antlr.jar +ln -s %{_javadir}/ant/ant-apache-bcel.jar $ANTDIR/ant-apache-bcel.jar +#ln -s %{_javadir}/ant/ant-apache-bsf.jar $ANTDIR/ant-apache-bsf.jar +ln -s %{_javadir}/ant/ant-apache-log4j.jar $ANTDIR/ant-apache-log4j.jar +ln -s %{_javadir}/ant/ant-apache-oro.jar $ANTDIR/ant-apache-oro.jar +ln -s %{_javadir}/ant/ant-apache-regexp.jar $ANTDIR/ant-apache-regexp.jar +ln -s %{_javadir}/ant/ant-apache-resolver.jar $ANTDIR/ant-apache-resolver.jar +ln -s %{_javadir}/ant/ant-commons-logging.jar $ANTDIR/ant-commons-logging.jar # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642 # the symlinks that are commented-out are not currently shipped on Fedora -#ln -s %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-net.jar -#ln -s %{_javadir}/ant/ant-jai.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jai.jar -ln -s %{_javadir}/ant.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant.jar -ln -s %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-javamail.jar -ln -s %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jdepend.jar -#ln -s %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jmf.jar -ln -s %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jsch.jar -ln -s %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-junit.jar -ln -s %{_javadir}/ant-launcher.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-launcher.jar -#ln -s %{_javadir}/ant/ant-netrexx.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-netrexx.jar -ln -s %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-nodeps.jar -#ln -s %{_javadir}/ant/ant-starteam.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-starteam.jar -#ln -s %{_javadir}/ant/ant-stylebook.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-stylebook.jar -ln -s %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-swing.jar -ln -s %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-trax.jar -#ln -s %{_javadir}/ant/ant-weblogic.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-weblogic.jar +#ln -s %{_javadir}/ant/ant-commons-net.jar $ANTDIR/ant-commons-net.jar +#ln -s %{_javadir}/ant/ant-jai.jar $ANTDIR/ant-jai.jar +ln -s %{_javadir}/ant.jar $ANTDIR/ant.jar +ln -s %{_javadir}/ant/ant-javamail.jar $ANTDIR/ant-javamail.jar +ln -s %{_javadir}/ant/ant-jdepend.jar $ANTDIR/ant-jdepend.jar +#ln -s %{_javadir}/ant/ant-jmf.jar $ANTDIR/ant-jmf.jar +ln -s %{_javadir}/ant/ant-jsch.jar $ANTDIR/ant-jsch.jar +ln -s %{_javadir}/ant/ant-junit.jar $ANTDIR/ant-junit.jar +ln -s %{_javadir}/ant-launcher.jar $ANTDIR/ant-launcher.jar +#ln -s %{_javadir}/ant/ant-netrexx.jar $ANTDIR/ant-netrexx.jar +ln -s %{_javadir}/ant/ant-nodeps.jar $ANTDIR/ant-nodeps.jar +#ln -s %{_javadir}/ant/ant-starteam.jar $ANTDIR/ant-starteam.jar +#ln -s %{_javadir}/ant/ant-stylebook.jar $ANTDIR/ant-stylebook.jar +ln -s %{_javadir}/ant/ant-swing.jar $ANTDIR/ant-swing.jar +ln -s %{_javadir}/ant/ant-trax.jar $ANTDIR/ant-trax.jar +#ln -s %{_javadir}/ant/ant-weblogic.jar $ANTDIR/ant-weblogic.jar ## END ANT ## -## BEGIN TOMCAT ## -rm plugins/org.eclipse.tomcat/commons-beanutils.jar -rm plugins/org.eclipse.tomcat/commons-collections.jar -rm plugins/org.eclipse.tomcat/commons-digester.jar -rm plugins/org.eclipse.tomcat/commons-logging-api.jar -rm plugins/org.eclipse.tomcat/commons-modeler.jar -rm plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar -rm plugins/org.eclipse.tomcat/servlet.jar -rm plugins/org.eclipse.tomcat/servlets-manager.jar -rm plugins/org.eclipse.tomcat/naming-common.jar -rm plugins/org.eclipse.tomcat/servlets-common.jar -rm plugins/org.eclipse.tomcat/tomcat-http11.jar -rm plugins/org.eclipse.tomcat/bootstrap.jar -rm plugins/org.eclipse.tomcat/catalina.jar -rm plugins/org.eclipse.tomcat/jasper-compiler.jar -rm plugins/org.eclipse.tomcat/jasper-runtime.jar -rm plugins/org.eclipse.tomcat/mx4j-jmx.jar -rm plugins/org.eclipse.tomcat/naming-resources.jar -rm plugins/org.eclipse.tomcat/naming-factory.jar -rm plugins/org.eclipse.tomcat/servlets-default.jar -rm plugins/org.eclipse.tomcat/servlets-invoker.jar -rm plugins/org.eclipse.tomcat/tomcat-coyote.jar -rm plugins/org.eclipse.tomcat/tomcat-util.jar -ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar -ln -s %{_javadir}/tomcat5/catalina.jar plugins/org.eclipse.tomcat/catalina.jar -ln -s %{_javadir}/tomcat5/catalina-optional.jar plugins/org.eclipse.tomcat/catalina-optional.jar -ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat/mx4j.jar -ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat/mx4j-impl.jar -ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/mx4j-jmx.jar -ln -s %{_javadir}/tomcat5/naming-factory.jar plugins/org.eclipse.tomcat/naming-factory.jar -ln -s %{_javadir}/tomcat5/naming-resources.jar plugins/org.eclipse.tomcat/naming-resources.jar -ln -s %{_javadir}/tomcat5/servlets-default.jar plugins/org.eclipse.tomcat/servlets-default.jar -ln -s %{_javadir}/tomcat5/servlets-invoker.jar plugins/org.eclipse.tomcat/servlets-invoker.jar -ln -s %{_javadir}/tomcat5/tomcat-coyote.jar plugins/org.eclipse.tomcat/tomcat-coyote.jar -ln -s %{_javadir}/tomcat5/tomcat-http.jar plugins/org.eclipse.tomcat/tomcat-http.jar -ln -s %{_javadir}/tomcat5/tomcat-util.jar plugins/org.eclipse.tomcat/tomcat-util.jar -build-jar-repository -s -p plugins/org.eclipse.tomcat commons-beanutils -build-jar-repository -s -p plugins/org.eclipse.tomcat commons-collections -build-jar-repository -s -p plugins/org.eclipse.tomcat commons-dbcp -build-jar-repository -s -p plugins/org.eclipse.tomcat commons-digester -build-jar-repository -s -p plugins/org.eclipse.tomcat commons-digester-rss -build-jar-repository -s -p plugins/org.eclipse.tomcat commons-el -build-jar-repository -s -p plugins/org.eclipse.tomcat commons-fileupload -build-jar-repository -s -p plugins/org.eclipse.tomcat commons-launcher -build-jar-repository -s -p plugins/org.eclipse.tomcat commons-logging-api -build-jar-repository -s -p plugins/org.eclipse.tomcat commons-modeler -build-jar-repository -s -p plugins/org.eclipse.tomcat commons-pool -build-jar-repository -s -p plugins/org.eclipse.tomcat jasper5-compiler -build-jar-repository -s -p plugins/org.eclipse.tomcat jasper5-runtime -build-jar-repository -s -p plugins/org.eclipse.tomcat jspapi -build-jar-repository -s -p plugins/org.eclipse.tomcat regexp -build-jar-repository -s -p plugins/org.eclipse.tomcat servletapi5 -## END TOMCAT ## - JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty_5 | sed 's/org.mortbay.jetty_//') rm plugins/org.mortbay.jetty_$JETTYPLUGINVERSION ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty_$JETTYPLUGINVERSION @@ -537,146 +491,60 @@ build-jar-repository -s -p plugins/org.junit_$JUNITVERSION junit rm plugins/org.junit4/junit.jar ln -s %{_javadir}/junit4.jar plugins/org.junit4/junit.jar -%if %{gcj_support} -find plugins -type f -name \*.xml -exec sed --in-place "s/\(\)/<\!-- \1 -->/" "{}" \; -%endif - -# the swt version is set to HEAD on ia64 but shouldn't be -# get swt version -SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =) -SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =) -SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER -swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") -swt_frag_ver_ia64=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") -sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml \ - assemble.org.eclipse.sdk.linux.gtk.ia64.xml \ - features/org.eclipse.rcp/build.xml -%patch29 - -# Nasty hack to get suppport for ppc64, sparc{,64} and alpha -%patch24 -p1 -%patch28 -%patch30 -%patch31 -p1 - -# there is only partial support for ppc64 so we have to remove this -# partial support to get the replacement hack to work -find -name \*ppc64\* | xargs rm -r -# remove ppc64 support from features/org.eclipse.platform.source/feature.xml -# replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets -find -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" "{}" \; -# remove org.eclipse.platform.source.linux.gtk.ppc64 -sed -i "50,54d" features/org.eclipse.platform.source/build.xml -# replace final occurances with an existing arch -sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml -# Move all of the ia64 directories and files to ppc64 or sparc{,64} or alpha dirs and replace -# the ia64 strings with ppc64 etc. -%ifarch ppc64 sparc sparcv9 sparc64 alpha - for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do - tofile=$(echo $f | sed "s/ia64/%{_arch}/") - mv $f $tofile -# sed --in-place "s/ia64/%{_arch}/g" $tofile - done - OLDIFS=$IFS -IFS=' -' - for f in $(find -type f ! -name \*.java -a ! -name feature.xml -a ! -name \*.gif \ - -a ! -name \*.png -a ! -name \*.htm* -a ! -name \*.jar -a ! -name \ - \*.exe -a ! -name \*.pm -a ! -name \*.jpg); do - sed -i -e "s/ia64_32/@eye-eh-64_32@/g" -e "s/ia64/%{_arch}/g" -e "s/@eye-eh-64_32@/ia64_32/g" $f - done - IFS=$OLDIFS -%endif - -%ifarch ppc64 sparc sparcv9 sparc64 alpha ia64 -IFS=' -' - # Copy over the fragments for these arches - cp -pr plugins/org.eclipse.equinox.launcher.gtk.linux.{ppc,%{_arch}} - pushd plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch} - for f in $(find -type f); do - sed -i -e "s/ppc/%{_arch}/g" $f - done - popd - cp -pr plugins/org.eclipse.core.filesystem.linux.{ppc,%{_arch}} - pushd plugins/org.eclipse.core.filesystem.linux.%{_arch} - for f in $(find -type f); do - sed -i -e "s/ppc/%{_arch}/g" $f - done - popd - IFS=$OLDIFS -%endif - -# remove jdt.apt.pluggable.core, jdt.compiler.tool and org.eclipse.jdt.compiler.apt as they require a JVM that supports Java 1.6 -for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do - version=$(grep org.eclipse.$plugin plugins/org.eclipse.$plugin/build.xml | grep condition.property | cut -d _ -f 2-3 | cut -d \" -f 1) - sed --in-place "s/org.eclipse.$plugin:0.0.0,$version,//" features/org.eclipse.jdt/build.xml - linenum=$(grep -no "plugins/org.eclipse.$plugin" features/org.eclipse.jdt/build.xml | cut -d : -f 1) - sed --in-place -e "$linenum,$(expr $linenum + 4)d" features/org.eclipse.jdt/build.xml -# If we're build with IcedTea then we don't want to remove the plugins from the -# feature.xml because we will build these plugins after the main build. This -# allows us to produce 1.5 bytecode for all of the SDK except for the parts that -# explicitly use Java 1.6. This enables GCJ to work with Eclipse on all platforms. -%if ! %{gcj_support} - linenum=$(grep -no $plugin features/org.eclipse.jdt/feature.xml | cut -d : -f 1) - sed --in-place -e "$(expr $linenum - 1),$(expr $linenum + 5)d" features/org.eclipse.jdt/feature.xml -%endif - linenum=$(grep -no "dir=\"plugins/org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1) - sed --in-place -e "$linenum,$(expr $linenum + 2)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml - linenum=$(grep -no "value=\"org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1) - sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml -done - -pushd plugins/org.eclipse.swt -# Build mozilla bindings against xulrunner -mv "Eclipse SWT PI" Eclipse_SWT_PI -%patch32 -mv Eclipse_SWT_PI "Eclipse SWT PI" - -# Create eclipse mozilla profile if it doesn't exist -mv "Eclipse SWT Mozilla" Eclipse_SWT_Mozilla -mv "Eclipse SWT" Eclipse_SWT -%patch33 -mv Eclipse_SWT "Eclipse SWT" -mv Eclipse_SWT_Mozilla "Eclipse SWT Mozilla" -popd - - # link to the jsch jar -rm plugins/com.jcraft.jsch_0.1.31.jar -ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.31.jar +JSCHVERSION=$(ls plugins | grep com.jcraft.jsch_ | \ + sed 's/com.jcraft.jsch_//') +rm plugins/com.jcraft.jsch_*.jar +ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION # link to the icu4j stuff -rm plugins/com.ibm.icu_3.6.1.v20070906.jar -ln -s %{_datadir}/eclipse/plugins/com.ibm.icu_3.6.1.v20070906.jar plugins/com.ibm.icu_3.6.1.v20070906.jar +ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//') +rm plugins/com.ibm.icu_*.jar +ln -s %{_datadir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION # link to lucene -rm plugins/org.apache.lucene_1.9.1.v200706111724.jar -ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene_1.9.1.v200706111724.jar -rm plugins/org.apache.lucene.analysis_1.9.1.v200706181610.jar -ln -s %{_javadir}/lucene-contrib/lucene-analyzers.jar plugins/org.apache.lucene.analysis_1.9.1.v200706181610.jar +LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \ + sed 's/org.apache.lucene_//') +rm plugins/org.apache.lucene_* +ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene_$LUCENEVERSION +rm plugins/org.apache.lucene.analysis_* +ln -s %{_javadir}/lucene-contrib/lucene-analyzers.jar \ + plugins/org.apache.lucene.analysis_$LUCENEVERSION # link to commons-logging -rm plugins/org.apache.commons.logging_1.0.4.v200706111724.jar -ln -s %{_javadir}/commons-logging.jar plugins/org.apache.commons.logging_1.0.4.v200706111724.jar +COMMONSLOGGINGVERSION=$(ls plugins | grep commons.logging_ | \ + sed 's/org.apache.commons.logging_//') +rm plugins/org.apache.commons.logging_$COMMONSLOGGINGVERSION +ln -s %{_javadir}/commons-logging.jar \ + plugins/org.apache.commons.logging_$COMMONSLOGGINGVERSION # link to commons-el -rm plugins/org.apache.commons.el_1.0.0.v200706111724.jar -ln -s %{_javadir}/commons-el.jar plugins/org.apache.commons.el_1.0.0.v200706111724.jar +COMMONSELVERSION=$(ls plugins | grep commons.el_ | \ + sed 's/org.apache.commons.el_//') +rm plugins/org.apache.commons.el_$COMMONSELVERSION +ln -s %{_javadir}/commons-el.jar \ + plugins/org.apache.commons.el_$COMMONSELVERSION # link to jasper -rm plugins/org.apache.jasper_5.5.17.v200706111724.jar -ln -s %{_datadir}/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar \ - plugins/org.apache.jasper_5.5.17.v200706111724.jar +JASPERVERSION=$(ls plugins | grep org.apache.jasper_ | \ + sed 's/org.apache.jasper_//') +rm plugins/org.apache.jasper_*.jar +ln -s %{_datadir}/eclipse/plugins/org.apache.jasper_* \ + plugins/org.apache.jasper_$JASPERVERSION # link to servlet-api -rm plugins/javax.servlet_2.4.0.v200706111738.jar -ln -s %{_javadir}/tomcat5-servlet-2.4-api.jar plugins/javax.servlet_2.4.0.v200706111738.jar +SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_ | \ + sed 's/javax.servlet_//') +rm plugins/javax.servlet_* +ln -s %{_javadir}/tomcat5-servlet-2.4-api.jar \ + plugins/javax.servlet_$SERVLETAPIVERSION # link to jsp-api -rm plugins/javax.servlet.jsp_2.0.0.v200706191603.jar -ln -s %{_javadir}/tomcat5-jsp-2.0-api.jar plugins/javax.servlet.jsp_2.0.0.v200706191603.jar - +JSPAPIVERSION=$(ls plugins | grep javax.servlet.jsp_ | \ + sed 's/javax.servlet.jsp_//') +rm plugins/javax.servlet.jsp_* +ln -s %{_javadir}/tomcat5-jsp-2.0-api.jar \ + plugins/javax.servlet.jsp_$JSPAPIVERSION # delete included jars # https://bugs.eclipse.org/bugs/show_bug.cgi?id=170662 @@ -687,86 +555,63 @@ rm plugins/org.eclipse.swt.win32.win32.x86/swt.jar \ plugins/org.eclipse.osgi/osgi/osgi.core.jar \ plugins/org.eclipse.osgi/supplement/osgi/osgi.jar +# FIXME: figure out a way to symlink to something. Alternatively, +# patch out of package.org.eclipse.sdk*.xml. +# Delete unnecessary-for-build source JARs +#rm plugins/*.source_*.jar + # make sure there are no jars left JARS="" for j in $(find -name \*.jar); do if [ ! -L $j ]; then - JARS="$JARS $j" + JARS="$JARS `echo $j`" fi done if [ ! -z "$JARS" ]; then echo "These jars should be deleted and symlinked to system jars: $JARS" + rm plugins/org.eclipse.ecf*.jar #FIXME: enable exit 1 fi tar jxf %{SOURCE20} +# ECF filetransfer plugins +tar jxf %{SOURCE25} +pushd org.eclipse.ecf +%patch35 +mkdir -p features/org.eclipse.ecf.filetransfer-feature +pushd features/org.eclipse.ecf.filetransfer-feature +cp -p %{SOURCE26} feature.xml +cp -p %{SOURCE27} build.properties +popd + %build ORIGCLASSPATH=$CLASSPATH # Bootstrapping: -# 1. Build ecj with gcj-built ecj ("javac") -# 2. Re-build ecj with output of 1. - -# 1a. compile ecj with javac +# 1. Build ecj with javac ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" -buildfile jdtcoresrc/compilejdtcorewithjavac.xml -%if %{gcj_support} - # 1b. Natively-compile ecj - gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ - -o jdtcoresrc/ecj.jar.so jdtcoresrc/ecj.jar - - gcj-dbtool -n jdtcoresrc/ecj.db 30000 - gcj-dbtool -a jdtcoresrc/ecj.db jdtcoresrc/ecj.jar{,.so} - - # To ensure we're not using any pre-compiled ecj on the build system, set this - export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db" -%endif - # 2. Use this ecj to rebuild itself export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" -buildfile jdtcoresrc/compilejdtcore.xml -%if %{gcj_support} - # Natively-compile it - gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ - -o ecj.jar.so ecj.jar - gcj-dbtool -n ecj.db 30000 - gcj-dbtool -a ecj.db ecj.jar{,.so} - export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj.db" - - # Remove old native bits - rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so -%endif - # Build the rest of Eclipse export CLASSPATH=`pwd`/ecj.jar:$ORIGCLASSPATH export JAVA_HOME=%{java_home} ant \ -Dnobootstrap=true \ -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \ - -Dlibsconfig=true -DjavacSource=1.5 -DjavacTarget=1.5 -DcompilerArg="-encoding ISO-8859-1 -nowarn" + -Dlibsconfig=true \ + -DJavaSE-1.6=%{_jvmdir}/java/jre/lib/rt.jar \ + -DcompilerArg="-encoding ISO-8859-1 -nowarn" -# build 1.6 when building with IcedTea +# Build the FileInitializer application SDK=$(cd eclipse && pwd) mkdir -p home homedir=$(cd home && pwd) LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//') - -%if ! %{gcj_support} -for plugin in jdt.compiler.tool jdt.compiler.apt jdt.apt.pluggable.core; do - pushd plugins/org.eclipse.$plugin - java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - build.update.jar \ - -vmargs -Duser.home=$homedir - popd -done -%endif - -## Build the FileInitializer application -PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build | sed 's/org.eclipse.pde.build_//') +PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//') pushd equinox-incubator mkdir -p build @@ -794,6 +639,23 @@ java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \ popd popd +# Build the ECF filetransfer plugins +pushd org.eclipse.ecf +mkdir -p build + +java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \ + -Duser.home=$homedir \ + org.eclipse.core.launcher.Main \ + -application org.eclipse.ant.core.antRunner \ + -Dtype=feature \ + -Did=org.eclipse.ecf.filetransfer_feature \ + -DsourceDirectory=$(pwd) \ + -DbaseLocation=$SDK \ + -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build \ + -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml + +popd + %install rm -rf $RPM_BUILD_ROOT @@ -803,88 +665,109 @@ SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/m SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER # Some directories we need -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/links install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name} install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/features install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java # Explode the resulting SDK tarball -tar -C $RPM_BUILD_ROOT%{_datadir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz -cp eclipse/eclipse $RPM_BUILD_ROOT%{_datadir}/eclipse -%ifarch ppc64 sparc sparcv9 sparc64 alpha ia64 -cp features/org.eclipse.platform/gtk/eclipse.ini $RPM_BUILD_ROOT%{_libdir}/eclipse -%else -mv $RPM_BUILD_ROOT%{_datadir}/eclipse/eclipse.ini \ - $RPM_BUILD_ROOT%{_libdir}/eclipse -%endif +tar -C $RPM_BUILD_ROOT%{_libdir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz -# Install 1.6 plugins when building with IcedTea -%if ! %{gcj_support} -for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do - cp plugins/org.eclipse.$plugin/org.eclipse.$plugin_*.jar $RPM_BUILD_ROOT%{_datadir}/eclipse/plugins -done -%endif +# ECF filetransfer plugins we built +rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.ecf*.jar +unzip -d $RPM_BUILD_ROOT%{_libdir} \ + org.eclipse.ecf/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip +# Remove the feature we used for building +rm -rf \ + $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.ecf.filetransfer_feature_* -# Add a compatibility symlink to startup.jar -pushd $RPM_BUILD_ROOT%{_datadir}/%{name} -LAUNCHERNAME=$(ls plugins | grep equinox.launcher_) -ln -s plugins/$LAUNCHERNAME startup.jar -popd +installDir=$RPM_BUILD_ROOT%{_libdir}/%{name} +metadataDir=$installDir/metadata +installFolder=$RPM_BUILD_ROOT%{_libdir}/%{name}-tmp + +LAUNCHERVERSION=$(ls $installDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//') # Install the file initializer app -cp equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins +cp -p equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \ + $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins # Install the Fedora Eclipse product plugin -unzip -qq -d $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins %{SOURCE4} +unzip -qq -d $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins %{SOURCE4} # Install the Fedora Eclipse product feature -unzip -qq -d $RPM_BUILD_ROOT%{_datadir}/%{name}/features %{SOURCE5} +unzip -qq -d $RPM_BUILD_ROOT%{_libdir}/%{name}/features %{SOURCE5} + +# Generate metadata +java \ +-cp $installDir/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \ +org.eclipse.core.launcher.Main \ +-application \ +org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \ +-metadataRepository file:$metadataDir \ +-artifactRepository file:$metadataDir \ +-source $installDir \ +-root sdk \ +-rootVersion 3.4.0 \ +-flavor tooling \ +-publishArtifacts \ +-append \ +-artifactRepositoryName "Fedora Eclipse" \ +-metadataRepositoryName "Fedora Eclipse" + +# Director config.ini +cp -p %{SOURCE22} $installDir/configuration/config.ini + +chmod u+x $installDir/eclipse + +# Provision SDK with director +$installDir/eclipse \ +-application \ +org.eclipse.equinox.p2.director.app.application \ +-nosplash \ +-debug \ +-consolelog \ +-flavor tooling \ +-installIU sdk \ +-version %{version} \ +-p2.os linux \ +-p2.ws gtk \ +-p2.arch %{eclipse_arch} \ +-roaming \ +-profile SDKProfile \ +-profileProperties org.eclipse.update.install.features=true \ +-metadataRepository file:$metadataDir \ +-artifactRepository file:$metadataDir \ +-destination $installFolder \ +-bundlepool $installFolder \ +-vmargs \ +-Declipse.p2.data.area=$installFolder/p2 + +# Some extra stuff +for f in about_files {about,epl-v10,notice}.html readme metadata; do + cp -rp $installDir/$f $installFolder +done -# Set up an extension location and a link file for the arch-specific dir -echo "path:$RPM_BUILD_ROOT%{_libdir}" > $RPM_BUILD_ROOT%{_datadir}/%{name}/links/fragments.link -echo "name=Eclipse Platform" > $RPM_BUILD_ROOT%{_libdir}/%{name}/.eclipseextension -echo "id=org.eclipse.platform" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/.eclipseextension -echo "version=%{eclipse_majmin}.%{eclipse_micro}" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/.eclipseextension +# Ship the provisioned SDK +rm -rf $installDir +mv $installFolder $installDir -# Install the platform-specific fragments in an arch-specific dir -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/*%{eclipse_arch}* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins +rm -rf $installDir/p2/org.eclipse.equinox.p2.core/cache +rm -rf $installDir/p2/org.eclipse.equinox.p2.engine/profileRegistry/* +rm -rf $installDir/p2/org.eclipse.equinox.p2.director/rollback/content.xml +sed -i "s:file\:$installFolder/\ -\ bundle\ pool:Eclipse\ SDK:g" \ + $installDir/artifacts.xml -# platform.source has the launcher src zip which is platform-specific -PLATFORMSOURCEVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep platform.source_ | sed 's/org.eclipse.platform.source_//') -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform.source_$PLATFORMSOURCEVERSION \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins - -# help.webapp generates web.xml with Apache Jakarta Tomcat JspC. This file is -# generated differently for different arches. FIXME investigate this. -HELPWEBAPPVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep help.webapp_ | sed 's/org.eclipse.help.webapp_//') -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.help.webapp_$HELPWEBAPPVERSION \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins +%ifarch ppc64 sparc sparcv9 sparc64 alpha ia64 +cp -p features/org.eclipse.platform/gtk/eclipse.ini $RPM_BUILD_ROOT%{_libdir}/eclipse +%endif -# update.core.linux is a fragment -# FIXME: make a patch for upstream to change to swt fragment notation -UPDATECORELINUXVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep update.core.linux_ | sed 's/org.eclipse.update.core.linux_//') -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_$UPDATECORELINUXVERSION \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins +cp -p features/org.eclipse.platform/gtk/eclipse.ini.patched \ + $RPM_BUILD_ROOT%{_libdir}/eclipse/eclipse.ini -# FIXME: there is a problem with gjdoc generating different HTML on different -# architectures. -PLATFORMDOCISVVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep platform.doc.isv_ | sed 's/org.eclipse.platform.doc.isv_//') -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.isv_$PLATFORMDOCISVVERSION \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins -# ppc64 is problematic with these two -JDTDOCISVVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep jdt.doc.isv_ | sed 's/org.eclipse.jdt.doc.isv_//') -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.isv_$JDTDOCISVVERSION \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins -PDEDOCUSERVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep pde.doc.user_ | sed 's/org.eclipse.pde.doc.user_//') -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.pde.doc.user_$PDEDOCUSERVERSION \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins - -# Adding support for ppc64 and sparc{64} makes the rcp feature -# have multilib conflicts -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/features/org.eclipse.rcp_* \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/features +# Add a compatibility symlink to startup.jar +pushd $RPM_BUILD_ROOT%{_libdir}/%{name} +LAUNCHERNAME=$(ls plugins | grep equinox.launcher_) +ln -s plugins/$LAUNCHERNAME startup.jar +popd # FIXME: investigate why it doesn't work to set this -- configuration data is # always written to /usr/share/eclipse/configuration, even with @@ -895,23 +778,16 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}/features/org.eclipse.rcp_* \ # Extract .so files # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535 pushd $RPM_BUILD_ROOT -datadir_path=$(echo %{_datadir}/%{name} | sed -e 's/^\///') libdir_path=$(echo %{_libdir}/%{name} | sed -e 's/^\///') java -Dosgi.sharedConfiguration.area=$libdir_path/configuration \ - -cp $datadir_path/startup.jar \ + -cp $libdir_path/startup.jar \ org.eclipse.core.launcher.Main \ -consolelog \ -application org.eclipse.equinox.initializer.configInitializer \ -fileInitializer %{SOURCE19} popd -# Make proper links file -echo "path:/usr/lib" > $RPM_BUILD_ROOT%{_datadir}/%{name}/links/fragments.link -echo "path:/usr/lib64" > $RPM_BUILD_ROOT%{_datadir}/%{name}/links/fragments64.link - -# Install config.ini to an arch dependent location and remove the unnecessary -# configuration data -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/configuration $RPM_BUILD_ROOT%{_libdir}/%{name} +# Remove the unnecessary configuration data rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.update rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.core.runtime rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.app @@ -923,12 +799,13 @@ sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.fedora $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini # Install the Eclipse binary wrapper -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipse $RPM_BUILD_ROOT%{_libdir}/%{name} install -d -m 755 $RPM_BUILD_ROOT%{_bindir} -cp %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/eclipse -sed --in-place "s|@LIBDIR@|%{_libdir}|g" $RPM_BUILD_ROOT%{_bindir}/eclipse -ECLIPSELIBSUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux*/*.so | sed "s/.*.launcher.gtk.linux.//") -sed --in-place "s|@ECLIPSELIBSUFFIX@|$ECLIPSELIBSUFFIX|" $RPM_BUILD_ROOT%{_bindir}/eclipse +ln -s %{_libdir}/%{name}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name} +#install -d -m 755 $RPM_BUILD_ROOT%{_bindir} +#cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/eclipse +#sed --in-place "s|@LIBDIR@|%{_libdir}|g" $RPM_BUILD_ROOT%{_bindir}/eclipse +#ECLIPSELIBSUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux*/*.so | sed "s/.*.launcher.gtk.linux.//") +#sed --in-place "s|@ECLIPSELIBSUFFIX@|$ECLIPSELIBSUFFIX|" $RPM_BUILD_ROOT%{_bindir}/eclipse # Ensure the shared libraries have the correct permissions pushd $RPM_BUILD_ROOT%{_libdir}/%{name} @@ -936,21 +813,21 @@ for lib in `find configuration -name \*.so`; do chmod 755 $lib done -# Ensure the launcher binary has the correct permission +# Ensure the launcher binary has the correct permissions chmod 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{name} # Create file listings for the extracted shared libraries echo -n "" > %{_builddir}/%{buildsubdir}/%{name}-platform.install; for id in `ls configuration/org.eclipse.osgi/bundles`; do if [ "Xconfiguration" = $(echo X`find configuration/org.eclipse.osgi/bundles/$id -name libswt\*.so` | sed "s:/.*::") ]; then - echo "%{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" > %{_builddir}/%{buildsubdir}/%{libname}-gtk2.install; + echo "%{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" > %{_builddir}/%{buildsubdir}/%{name}-swt.install; else echo "%{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" >> %{_builddir}/%{buildsubdir}/%{name}-platform.install; fi done popd -# Install symlinks to the SWT JNI shared libraries in /usr/lib/eclipse +# Install symlinks to the SWT JNI shared libraries in %%{_libdir}/eclipse pushd $RPM_BUILD_ROOT%{_libdir}/%{name} for lib in $(find configuration -name libswt\*.so); do ln -s %{_libdir}/%{name}/$lib `basename $lib` @@ -967,9 +844,9 @@ ln -s ../%{name}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar ../java/swt.jar popd # Install the eclipse-ecj.jar symlink for java-1.4.2-gcj-compat's "javac" -JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//") +JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//") install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX \ +ln -s %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX \ $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj-%{version}.jar ln -s %{_javadir}/eclipse-ecj-%{version}.jar \ $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj.jar @@ -985,31 +862,26 @@ ln -s %{_javadir}/ecj-%{version}.jar \ # FIXME: get rid of this by putting logic in package build to know what version # of pde.build it's using # Install a versionless pde.build -pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/ +pushd $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/ ln -s org.eclipse.pde.build_* org.eclipse.pde.build popd # Icons install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps -ln -s %{_datadir}/%{name}/plugins/org.fedoraproject.ide.platform/eclipse48.png \ +ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform/eclipse48.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps -ln -s %{_datadir}/%{name}/plugins/org.fedoraproject.ide.platform/eclipse32.png \ +ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform/eclipse32.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps -ln -s ../../../../%{name}/plugins/org.fedoraproject.ide.platform/eclipse.png \ +ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform/eclipse.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps -%ifarch %{ix86} x86_64 -# Remove unused icon.xpm -# see https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848 -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/icon.xpm -%endif # Install the efj wrapper script install -p -D -m0755 %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/efj -sed --in-place "s:startup.jar:%{_datadir}/%{name}/startup.jar:" \ +sed --in-place "s:startup.jar:%{_libdir}/%{name}/startup.jar:" \ $RPM_BUILD_ROOT%{_bindir}/efj # Install the ecj wrapper script @@ -1024,651 +896,431 @@ install -p -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}. # Create a script that can be used to make a symlink tree of the # eclipse platform. -cp %{SOURCE16} copy-platform +cp -p %{SOURCE16} copy-platform ( - cd $RPM_BUILD_ROOT%{_datadir}/%{name} + cd $RPM_BUILD_ROOT%{_libdir}/%{name} ls -d * | egrep -v '^(plugins|features|links|about_files)$' ls -d plugins/* features/* links/* ) | sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $eclipse/\1 \1,' >> copy-platform -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts -cp copy-platform $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts +mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts +cp -p copy-platform $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts # Install the PDE Build wrapper script. install -p -D -m0755 %{SOURCE21} \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/pdebuild + $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild + +pushd $RPM_BUILD_ROOT%{_libdir}/%{name} +rm plugins/org.sat4j* +ln -s %{_javadir}/org.sat4j.core_* plugins/ +ln -s %{_javadir}/org.sat4j.pb_* plugins/ + +ASMPLUGINVERSION=$(ls plugins | grep org.objectweb.asm_ | \ + sed 's/org.objectweb.asm_//') +rm plugins/org.objectweb.asm_$ASMPLUGINVERSION +ln -s %{_javadir}/objectweb-asm/asm-all.jar \ + plugins/org.objectweb.asm_$ASMPLUGINVERSION -pushd $RPM_BUILD_ROOT%{_datadir}/%{name} ## BEGIN ANT ## -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-antlr.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bcel.jar -#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bsf.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-log4j.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-oro.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-regexp.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-resolver.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-logging.jar -#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-net.jar -#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jai.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-javamail.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jdepend.jar -#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jmf.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jsch.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-junit.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-launcher.jar -#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-netrexx.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-nodeps.jar -#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-starteam.jar -#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-stylebook.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-swing.jar -rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-trax.jar -#rm plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-weblogic.jar -# FIXME: use build-jar-repository -ln -s %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-antlr.jar -ln -s %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bcel.jar -#ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-bsf.jar -ln -s %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-log4j.jar -ln -s %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-oro.jar -ln -s %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-regexp.jar -ln -s %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-apache-resolver.jar -ln -s %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-logging.jar +ANTDIR=plugins/$(ls plugins | grep org.apache.ant_) +rm $ANTDIR/lib/* +ANTDIR=$ANTDIR/lib +ln -s %{_javadir}/ant/ant-antlr.jar $ANTDIR/ant-antlr.jar +ln -s %{_javadir}/ant/ant-apache-bcel.jar $ANTDIR/ant-apache-bcel.jar +#ln -s %{_javadir}/ant/ant-apache-bsf.jar $ANTDIR/ant-apache-bsf.jar +ln -s %{_javadir}/ant/ant-apache-log4j.jar $ANTDIR/ant-apache-log4j.jar +ln -s %{_javadir}/ant/ant-apache-oro.jar $ANTDIR/ant-apache-oro.jar +ln -s %{_javadir}/ant/ant-apache-regexp.jar $ANTDIR/ant-apache-regexp.jar +ln -s %{_javadir}/ant/ant-apache-resolver.jar $ANTDIR/ant-apache-resolver.jar +ln -s %{_javadir}/ant/ant-commons-logging.jar $ANTDIR/ant-commons-logging.jar # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642 # the symlinks that are commented-out are not currently shipped on Fedora -#ln -s %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-commons-net.jar -#ln -s %{_javadir}/ant/ant-jai.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jai.jar -ln -s %{_javadir}/ant.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant.jar -ln -s %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-javamail.jar -ln -s %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jdepend.jar -#ln -s %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jmf.jar -ln -s %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-jsch.jar -ln -s %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-junit.jar -ln -s %{_javadir}/ant-launcher.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-launcher.jar -#ln -s %{_javadir}/ant/ant-netrexx.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-netrexx.jar -ln -s %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-nodeps.jar -#ln -s %{_javadir}/ant/ant-starteam.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-starteam.jar -#ln -s %{_javadir}/ant/ant-stylebook.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-stylebook.jar -ln -s %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-swing.jar -ln -s %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-trax.jar -#ln -s %{_javadir}/ant/ant-weblogic.jar plugins/org.apache.ant_1.7.0.v200706080842/lib/ant-weblogic.jar +#ln -s %{_javadir}/ant/ant-commons-net.jar $ANTDIR/ant-commons-net.jar +#ln -s %{_javadir}/ant/ant-jai.jar $ANTDIR/ant-jai.jar +ln -s %{_javadir}/ant.jar $ANTDIR/ant.jar +ln -s %{_javadir}/ant/ant-javamail.jar $ANTDIR/ant-javamail.jar +ln -s %{_javadir}/ant/ant-jdepend.jar $ANTDIR/ant-jdepend.jar +#ln -s %{_javadir}/ant/ant-jmf.jar $ANTDIR/ant-jmf.jar +ln -s %{_javadir}/ant/ant-jsch.jar $ANTDIR/ant-jsch.jar +ln -s %{_javadir}/ant/ant-junit.jar $ANTDIR/ant-junit.jar +ln -s %{_javadir}/ant-launcher.jar $ANTDIR/ant-launcher.jar +#ln -s %{_javadir}/ant/ant-netrexx.jar $ANTDIR/ant-netrexx.jar +ln -s %{_javadir}/ant/ant-nodeps.jar $ANTDIR/ant-nodeps.jar +#ln -s %{_javadir}/ant/ant-starteam.jar $ANTDIR/ant-starteam.jar +#ln -s %{_javadir}/ant/ant-stylebook.jar $ANTDIR/ant-stylebook.jar +ln -s %{_javadir}/ant/ant-swing.jar $ANTDIR/ant-swing.jar +ln -s %{_javadir}/ant/ant-trax.jar $ANTDIR/ant-trax.jar +#ln -s %{_javadir}/ant/ant-weblogic.jar $ANTDIR/ant-weblogic.jar ## END ANT ## -## BEGIN TOMCAT ## -TOMCATPLUGINVERSION=$(ls plugins | grep tomcat | sed 's/org.eclipse.tomcat_//') -for f in bootstrap catalina{,-optional} mx4j{,-impl,-jmx} \ - naming-{factory,resources} servlets-{default,invoker} \ - tomcat-{coyote,http,util} \ - commons-{beanutils,collections,dbcp,digester{,-rss},el,fileupload,launcher,logging-api,modeler,pool} \ - jasper5-{compiler,runtime} jspapi regexp servletapi5; -do rm plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/$f.jar; done -ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/bootstrap.jar -ln -s %{_javadir}/tomcat5/catalina.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/catalina.jar -ln -s %{_javadir}/tomcat5/catalina-optional.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/catalina-optional.jar -ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/mx4j.jar -ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/mx4j-impl.jar -ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/mx4j-jmx.jar -ln -s %{_javadir}/tomcat5/naming-factory.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/naming-factory.jar -ln -s %{_javadir}/tomcat5/naming-resources.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/naming-resources.jar -ln -s %{_javadir}/tomcat5/servlets-default.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/servlets-default.jar -ln -s %{_javadir}/tomcat5/servlets-invoker.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/servlets-invoker.jar -ln -s %{_javadir}/tomcat5/tomcat-coyote.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/tomcat-coyote.jar -ln -s %{_javadir}/tomcat5/tomcat-http.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/tomcat-http.jar -ln -s %{_javadir}/tomcat5/tomcat-util.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/tomcat-util.jar -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-beanutils -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-collections -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-dbcp -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-digester -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-digester-rss -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-el -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-fileupload -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-launcher -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-logging-api -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-modeler -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-pool -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION jasper5-compiler -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION jasper5-runtime -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION jspapi -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION regexp -build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION servletapi5 -## END TOMCAT ## - JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty_5 | sed 's/org.mortbay.jetty_//') rm plugins/org.mortbay.jetty_$JETTYPLUGINVERSION ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty_$JETTYPLUGINVERSION build-jar-repository -s -p plugins/org.junit_* junit -rm plugins/org.junit4_4.3.1/junit.jar -ln -s %{_javadir}/junit4.jar plugins/org.junit4_4.3.1/junit.jar +JUNIT4VERSION=$(ls plugins | grep org.junit4_ | sed 's/org.junit4_//') +rm plugins/org.junit4_$JUNIT4VERSION/junit.jar +ln -s %{_javadir}/junit4.jar plugins/org.junit4_$JUNIT4VERSION/junit.jar -# link to the jsch jar -rm plugins/com.jcraft.jsch_0.1.31.jar -ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.31.jar +JSCHVERSION=$(ls plugins | grep com.jcraft.jsch_ | sed 's/com.jcraft.jsch_//') +rm plugins/com.jcraft.jsch_$JSCHVERSION +ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION # link to the icu4j stuff -rm plugins/com.ibm.icu_3.6.1.v20070906.jar +ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//') +rm plugins/com.ibm.icu_*.jar +ln -s %{_datadir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION # link to lucene -rm plugins/org.apache.lucene_1.9.1.v200706111724.jar -ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene_1.9.1.v200706111724.jar -rm plugins/org.apache.lucene.analysis_1.9.1.v200706181610.jar -ln -s %{_javadir}/lucene-contrib/lucene-analyzers.jar plugins/org.apache.lucene.analysis_1.9.1.v200706181610.jar +LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \ + sed 's/org.apache.lucene_//') +rm plugins/org.apache.lucene_* +ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene_$LUCENEVERSION +rm plugins/org.apache.lucene.analysis_* +ln -s %{_javadir}/lucene-contrib/lucene-analyzers.jar \ + plugins/org.apache.lucene.analysis_$LUCENEVERSION # link to commons-logging -rm plugins/org.apache.commons.logging_1.0.4.v200706111724.jar -ln -s %{_javadir}/commons-logging.jar plugins/org.apache.commons.logging_1.0.4.v200706111724.jar +COMMONSLOGGINGVERSION=$(ls plugins | grep commons.logging_ | \ + sed 's/org.apache.commons.logging_//') +rm plugins/org.apache.commons.logging_$COMMONSLOGGINGVERSION +ln -s %{_javadir}/commons-logging.jar \ + plugins/org.apache.commons.logging_$COMMONSLOGGINGVERSION # link to commons-el -rm plugins/org.apache.commons.el_1.0.0.v200706111724.jar -ln -s %{_javadir}/commons-el.jar plugins/org.apache.commons.el_1.0.0.v200706111724.jar +COMMONSELVERSION=$(ls plugins | grep commons.el_ | \ + sed 's/org.apache.commons.el_//') +rm plugins/org.apache.commons.el_$COMMONSELVERSION +ln -s %{_javadir}/commons-el.jar \ + plugins/org.apache.commons.el_$COMMONSELVERSION # link to jasper -rm plugins/org.apache.jasper_5.5.17.v200706111724.jar +JASPERVERSION=$(ls plugins | grep org.apache.jasper_ | \ + sed 's/org.apache.jasper_//') +rm plugins/org.apache.jasper_*.jar +ln -s %{_datadir}/eclipse/plugins/org.apache.jasper_* \ + plugins/org.apache.jasper_$JASPERVERSION -# link to serlet-api -rm plugins/javax.servlet_2.4.0.v200706111738.jar -ln -s %{_javadir}/tomcat5-servlet-2.4-api.jar plugins/javax.servlet_2.4.0.v200706111738.jar +# link to servlet-api +SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_ | \ + sed 's/javax.servlet_//') +rm plugins/javax.servlet_* +ln -s %{_javadir}/tomcat5-servlet-2.4-api.jar \ + plugins/javax.servlet_$SERVLETAPIVERSION # link to jsp-api -rm plugins/javax.servlet.jsp_2.0.0.v200706191603.jar -ln -s %{_javadir}/tomcat5-jsp-2.0-api.jar plugins/javax.servlet.jsp_2.0.0.v200706191603.jar +JSPAPIVERSION=$(ls plugins | grep javax.servlet.jsp_ | \ + sed 's/javax.servlet.jsp_//') +rm plugins/javax.servlet.jsp_* +ln -s %{_javadir}/tomcat5-jsp-2.0-api.jar \ + plugins/javax.servlet.jsp_$JSPAPIVERSION popd -# Ensure that the zip files are the same across all builds. -# This is needed to make these package multilib compatible. -# FIXME: this needs to be re-written as a separate program -# warning: big hack! -mkdir -p ${RPM_BUILD_ROOT}/tmp -for zip in `find ${RPM_BUILD_ROOT}%{_datadir}/%{name} -type f -name \*.zip -o -type f -name \*.jar`; do - # unpack every zip, set the date of the files and directories and repack the zip - ZIPNAME=`basename $zip` - TMPDIR=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME.tmpdir.XXXXXXXXXX` - ZIPDIR=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME.zipdir.XXXXXXXXXX` - - pushd $TMPDIR - unzip -qq -o $zip - rm -f $zip - - # check if there are jars or zips inside the zip or jar - zipsinside=`find $TMPDIR -type f -name \*.zip -o -name \*.jar` - if [ -n "$zipsinside" ]; then - for zip2 in $zipsinside; do - # unpack every zip, set the date of the files and directories and repack the zip - ZIPNAME2=`basename $zip2` - TMPDIR2=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME2.tmpdir.XXXXXXXXXX` - ZIPDIR2=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME2.zipdir.XXXXXXXXXX` - - pushd $TMPDIR2 - unzip -qq -o $zip2 - rm -f $zip2 - - # create the directories first - for d in `find -type d | LC_ALL=C sort`; do - mkdir -p $ZIPDIR2/$d - done - # move the contents over to the a new directory in order and set the times. - for f in `find -type f | LC_ALL=C sort`; do - cp $f $ZIPDIR2/$f - touch --date="1980-01-01 UTC" $ZIPDIR2/$f - done - popd - - # Set the times of the directories. - touch --date="1980-01-01 UTC" `find $ZIPDIR2 -type d` - - # make the new zip - pushd $ZIPDIR2 - find -type f -print | LC_ALL=C sort | /usr/bin/zip -q -X -9 $zip2 -@ - popd - - # Cleanup. - rm -rf $TMPDIR2 - rm -rf $ZIPDIR2 - done - fi - - # now on to the original zip or jar. - # create the directories first - for d in `find -type d | LC_ALL=C sort`; do - mkdir -p $ZIPDIR/$d - done - # move the contents over to the a new directory in order and set the times. - for f in `find -type f | LC_ALL=C sort`; do - cp $f $ZIPDIR/$f - touch --date="1980-01-01 UTC" $ZIPDIR/$f - done - popd - - # Set the times of the directories. - touch --date="1980-01-01 UTC" `find $ZIPDIR -type d` - - # make the new zip - pushd $ZIPDIR - find -type f -print | LC_ALL=C sort | /usr/bin/zip -q -X -9 $zip -@ - popd - - # Cleanup. - rm -rf $TMPDIR - rm -rf $ZIPDIR -done -rm -rf ${RPM_BUILD_ROOT}/tmp - -pushd $RPM_BUILD_ROOT%{_datadir}/%{name} -# remove this python script so that it is not aot compiled, thus avoiding a -# multilib conflict -ANTPLUGINVERSION=$(ls plugins | grep org.apache.ant_ | sed 's/org.apache.ant_//') -rm plugins/org.apache.ant_$ANTPLUGINVERSION/bin/runant.py -UIIDEPLUGINVERSION=$(ls plugins | grep ui.ide_ | sed 's/org.eclipse.ui.ide_//') -OSGIPLUGINVERSION=$(ls plugins | grep osgi_ | sed 's/org.eclipse.osgi_//') -popd - -%if %{gcj_support} -%ifnarch ia64 -# exclude org.eclipse.ui.ide to work around -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=175547 -aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION -%else -aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION \ - --exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_$OSGIPLUGINVERSION -%endif -%endif - %clean rm -rf $RPM_BUILD_ROOT %post platform -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi %postun platform -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -%if %{gcj_support} -%post ecj -p %{_bindir}/rebuild-gcj-db -%postun ecj -p %{_bindir}/rebuild-gcj-db -%post -n %{libname}-gtk2 -p %{_bindir}/rebuild-gcj-db -%postun -n %{libname}-gtk2 -p %{_bindir}/rebuild-gcj-db -%post rcp -p %{_bindir}/rebuild-gcj-db -%postun rcp -p %{_bindir}/rebuild-gcj-db -%post jdt -p %{_bindir}/rebuild-gcj-db -%postun jdt -p %{_bindir}/rebuild-gcj-db -%post pde -p %{_bindir}/rebuild-gcj-db -%postun pde -p %{_bindir}/rebuild-gcj-db -%post pde-runtime -p %{_bindir}/rebuild-gcj-db -%postun pde-runtime -p %{_bindir}/rebuild-gcj-db -%endif - %files ecj %defattr(-,root,root) -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/plugins -%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_* +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/plugins +%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_* %{_javadir}/eclipse-ecj*.jar %{_javadir}/jdtcore*.jar %{_javadir}/ecj*.jar %{_bindir}/ecj -%if %{gcj_support} -%dir %{_libdir}/gcj/%{name} -%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_* -%endif -%files -n %{libname}-gtk2 -f %{libname}-gtk2.install +%files swt -f %{name}-swt.install %defattr(-,root,root) -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/plugins %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/libswt-*.so %dir %{_libdir}/%{name}/plugins %dir %{_libdir}/%{name}/configuration %dir %{_libdir}/%{name}/configuration/org.eclipse.osgi %dir %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles -%{_datadir}/%{name}/plugins/org.eclipse.swt_* +%{_libdir}/%{name}/plugins/org.eclipse.swt_* %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_* %{_libdir}/%{name}/swt-gtk*.jar %{_libdir}/%{name}/swt.jar %{_libdir}/java/swt.jar -%if %{gcj_support} -%dir %{_libdir}/gcj/%{name} -%{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_* -%endif %files rcp %defattr(-,root,root) -%dir %{_datadir}/%{name}/features %dir %{_libdir}/%{name}/features %{_libdir}/%{name}/configuration/org.eclipse.osgi/.bundledata* %{_libdir}/%{name}/configuration/org.eclipse.osgi/.lazy* %{_libdir}/%{name}/configuration/org.eclipse.osgi/.manager %{_libdir}/%{name}/configuration/org.eclipse.osgi/.state* %{_libdir}/%{name}/configuration/config.ini -%{_libdir}/%{name}/.eclipseextension -%{_datadir}/%{name}/.eclipseproduct -%{_datadir}/%{name}/notice.html -%{_datadir}/%{name}/epl-v10.html -%{_datadir}/%{name}/links -%{_datadir}/%{name}/startup.jar -%ifarch %{ix86} x86_64 -%{_datadir}/%{name}/about.html -%endif -%ifarch x86_64 -%{_datadir}/%{name}/about_files -%endif -%{_datadir}/%{name}/readme +# FIXME: where should this go? +%{_libdir}/%{name}/artifacts.xml +# FIXME: where should this go? +%{_libdir}/%{name}/metadata +# FIXME: where should this go? +%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator +%{_libdir}/%{name}/notice.html +%{_libdir}/%{name}/epl-v10.html +%{_libdir}/%{name}/about.html +%{_libdir}/%{name}/about_files +%{_libdir}/%{name}/readme +%{_libdir}/%{name}/startup.jar %{_libdir}/%{name}/features/org.eclipse.rcp_* -%{_datadir}/%{name}/plugins/org.eclipse.core.commands_* -%{_datadir}/%{name}/plugins/org.eclipse.core.contenttype_* -%{_datadir}/%{name}/plugins/org.eclipse.core.databinding_* -%{_datadir}/%{name}/plugins/org.eclipse.core.databinding.beans_* -%{_datadir}/%{name}/plugins/org.eclipse.core.expressions_* -%{_datadir}/%{name}/plugins/org.eclipse.core.jobs_* -%{_datadir}/%{name}/plugins/org.eclipse.core.runtime_* -%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.auth_* -%{_datadir}/%{name}/plugins/org.eclipse.equinox.app_* -%{_datadir}/%{name}/plugins/org.eclipse.equinox.common_* -%{_datadir}/%{name}/plugins/org.eclipse.equinox.launcher_* +%{_libdir}/%{name}/plugins/org.eclipse.core.commands_* +%{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_* +%{_libdir}/%{name}/plugins/org.eclipse.core.databinding_* +%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.beans_* +%{_libdir}/%{name}/plugins/org.eclipse.core.expressions_* +%{_libdir}/%{name}/plugins/org.eclipse.core.jobs_* +%{_libdir}/%{name}/plugins/org.eclipse.core.runtime_* +%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.auth_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.app_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.common_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.%{eclipse_arch}_* -%{_datadir}/%{name}/plugins/org.eclipse.equinox.preferences_* -%{_datadir}/%{name}/plugins/org.eclipse.equinox.registry_* -%{_datadir}/%{name}/plugins/org.eclipse.help_* -%{_datadir}/%{name}/plugins/org.eclipse.jface_* -%{_datadir}/%{name}/plugins/org.eclipse.jface.databinding_* -%{_datadir}/%{name}/plugins/org.eclipse.osgi_* -%{_datadir}/%{name}/plugins/org.eclipse.rcp_* -%{_datadir}/%{name}/plugins/org.eclipse.swt_* -%{_datadir}/%{name}/plugins/org.eclipse.ui_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench_* -%{_datadir}/%{name}/plugins/org.eclipse.update.configurator_* -%if %{gcj_support} -%{_libdir}/gcj/%{name}/org.eclipse.update.configurator_* -%ifnarch ia64 -%{_libdir}/gcj/%{name}/org.eclipse.osgi_* -%endif -%{_libdir}/gcj/%{name}/org.eclipse.equinox.registry_* -%{_libdir}/gcj/%{name}/org.eclipse.equinox.launcher_* -%{_libdir}/gcj/%{name}/org.eclipse.equinox.app_* -%{_libdir}/gcj/%{name}/org.eclipse.jface_* -%{_libdir}/gcj/%{name}/org.eclipse.jface.databinding_* -%{_libdir}/gcj/%{name}/org.eclipse.core.commands_* -%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility.auth_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_* -%{_libdir}/gcj/%{name}/org.eclipse.core.jobs_* -%{_libdir}/gcj/%{name}/org.eclipse.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_* -%{_libdir}/gcj/%{name}/org.eclipse.equinox.preferences_* -%{_libdir}/gcj/%{name}/org.eclipse.core.expressions_* -%{_libdir}/gcj/%{name}/org.eclipse.equinox.common_* -%{_libdir}/gcj/%{name}/org.eclipse.help_* -%{_libdir}/gcj/%{name}/org.eclipse.core.contenttype_* -%{_libdir}/gcj/%{name}/org.eclipse.core.databinding_* -%{_libdir}/gcj/%{name}/org.eclipse.core.databinding.beans_* -%endif - -%files cvs-client -%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_* -%{_datadir}/%{name}/plugins/org.eclipse.cvs_* -%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_* -%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ssh_* -%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ui_* -%{_datadir}/%{name}/features/org.eclipse.cvs_* -%if %{gcj_support} -%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.core_* -%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh_* -%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh2_* -%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_* -%endif +%{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_* +%{_libdir}/%{name}/plugins/org.eclipse.help_* +%{_libdir}/%{name}/plugins/org.eclipse.jface_* +%{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_* +%{_libdir}/%{name}/plugins/org.eclipse.osgi_* +%{_libdir}/%{name}/plugins/org.eclipse.rcp_* +%{_libdir}/%{name}/plugins/org.eclipse.swt_* +%{_libdir}/%{name}/plugins/org.eclipse.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_* +%{_libdir}/%{name}/plugins/org.eclipse.update.configurator_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator_* +%{_libdir}/%{name}/plugins/com.ibm.icu_* %files platform -f %{name}-platform.install %defattr(-,root,root) %attr(0755,root,root) %{_bindir}/%{name} %config %{_libdir}/%{name}/eclipse.ini -%{_libdir}/%{name}/eclipse %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_datadir}/icons/*/*/apps/* -%{_datadir}/%{name}/features/org.eclipse.platform_* -%{_datadir}/%{name}/plugins/com.jcraft.jsch_* -%{_datadir}/%{name}/plugins/javax.servlet_* -%{_datadir}/%{name}/plugins/javax.servlet.jsp_* -%{_datadir}/%{name}/plugins/org.apache.ant_* -%{_datadir}/%{name}/plugins/org.apache.commons.el_* -%{_datadir}/%{name}/plugins/org.apache.commons.logging_* -%{_datadir}/%{name}/plugins/org.apache.lucene_* -%{_datadir}/%{name}/plugins/org.apache.lucene.analysis_* -%{_datadir}/%{name}/plugins/org.eclipse.ant.core_* -%{_datadir}/%{name}/plugins/org.eclipse.compare_* -%{_datadir}/%{name}/plugins/org.eclipse.core.boot_* -%{_datadir}/%{name}/plugins/org.eclipse.core.filebuffers_* -%{_datadir}/%{name}/plugins/org.eclipse.core.filesystem_* -%{_datadir}/%{name}/plugins/org.fedoraproject.ide.platform -%{_datadir}/%{name}/features/org.fedoraproject.ide-feature +%{_libdir}/%{name}/eclipse +%{_libdir}/%{name}/features/org.eclipse.platform_* +%{_libdir}/%{name}/plugins/com.jcraft.jsch_* +%{_libdir}/%{name}/plugins/javax.servlet_* +%{_libdir}/%{name}/plugins/javax.servlet.jsp_* +%{_libdir}/%{name}/plugins/org.apache.ant_* +%{_libdir}/%{name}/plugins/org.apache.commons.el_* +%{_libdir}/%{name}/plugins/org.apache.commons.logging_* +%{_libdir}/%{name}/plugins/org.apache.lucene_* +%{_libdir}/%{name}/plugins/org.apache.lucene.analysis_* +%{_libdir}/%{name}/plugins/org.eclipse.ant.core_* +%{_libdir}/%{name}/plugins/org.eclipse.compare_* +%{_libdir}/%{name}/plugins/org.eclipse.core.boot_* +%{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_* +%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem_* +%{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_* +%{_libdir}/%{name}/features/org.fedoraproject.ide.feature_* %{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.%{eclipse_arch}_* -%{_datadir}/%{name}/plugins/org.eclipse.core.net_* -%{_datadir}/%{name}/plugins/org.eclipse.core.resources_* -%{_datadir}/%{name}/plugins/org.eclipse.core.resources.compatibility_* -%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_* -%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.registry_* -%{_datadir}/%{name}/plugins/org.eclipse.core.variables_* -%{_datadir}/%{name}/plugins/org.eclipse.debug.core_* -%{_datadir}/%{name}/plugins/org.eclipse.debug.ui_* -%{_datadir}/%{name}/plugins/org.eclipse.equinox.http.jetty_* -%{_datadir}/%{name}/plugins/org.eclipse.equinox.http.registry_* -%{_datadir}/%{name}/plugins/org.eclipse.equinox.http.servlet_* -%{_datadir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper_* -%{_datadir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper.registry_* -%{_datadir}/%{name}/plugins/org.eclipse.help.appserver_* -%{_datadir}/%{name}/plugins/org.eclipse.help.base_* -%{_datadir}/%{name}/plugins/org.eclipse.help.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.core.net_* +%{_libdir}/%{name}/plugins/org.eclipse.core.resources_* +%{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_* +%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_* +%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.registry_* +%{_libdir}/%{name}/plugins/org.eclipse.core.variables_* +%{_libdir}/%{name}/plugins/org.eclipse.debug.core_* +%{_libdir}/%{name}/plugins/org.eclipse.debug.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.jetty_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.registry_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.servlet_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper.registry_* +%{_libdir}/%{name}/plugins/org.eclipse.help.appserver_* +%{_libdir}/%{name}/plugins/org.eclipse.help.base_* +%{_libdir}/%{name}/plugins/org.eclipse.help.ui_* %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_* -%{_datadir}/%{name}/plugins/org.eclipse.jface.text_* -%{_datadir}/%{name}/plugins/org.eclipse.jsch.core_* -%{_datadir}/%{name}/plugins/org.eclipse.jsch.ui_* -%{_datadir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_* -%{_datadir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_* -%{_datadir}/%{name}/plugins/org.eclipse.osgi.services_* -%{_datadir}/%{name}/plugins/org.eclipse.osgi.util_* -%{_datadir}/%{name}/plugins/org.eclipse.platform_* -%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.user_* -%{_datadir}/%{name}/plugins/org.eclipse.search_* -%{_datadir}/%{name}/plugins/org.eclipse.team.core_* -%{_datadir}/%{name}/plugins/org.eclipse.team.ui_* -%{_datadir}/%{name}/plugins/org.eclipse.text_* -%{_datadir}/%{name}/plugins/org.eclipse.tomcat_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.browser_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.cheatsheets_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.console_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.editors_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.externaltools_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.forms_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.ide_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.ide.application_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.intro_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.intro.universal_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.navigator_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.navigator.resources_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.net_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.presentations.r21_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.views_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.views.properties.tabbed_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_* -%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_* -%{_datadir}/%{name}/plugins/org.eclipse.update.core_* +%{_libdir}/%{name}/plugins/org.eclipse.jface.text_* +%{_libdir}/%{name}/plugins/org.eclipse.jsch.core_* +%{_libdir}/%{name}/plugins/org.eclipse.jsch.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_* +%{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_* +%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_* +%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_* +%{_libdir}/%{name}/plugins/org.eclipse.platform_* +%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.user_* +%{_libdir}/%{name}/plugins/org.eclipse.search_* +%{_libdir}/%{name}/plugins/org.eclipse.team.core_* +%{_libdir}/%{name}/plugins/org.eclipse.team.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.text_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.browser_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.cheatsheets_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.console_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.editors_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.externaltools_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.forms_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.ide_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.ide.application_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.intro_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.intro.universal_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.navigator_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.navigator.resources_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.net_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.presentations.r21_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.views_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.views.properties.tabbed_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_* +%{_libdir}/%{name}/plugins/org.eclipse.update.core_* %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_* -%{_datadir}/%{name}/plugins/org.eclipse.update.scheduler_* -%{_datadir}/%{name}/plugins/org.eclipse.update.ui_* -%{_datadir}/%{name}/plugins/org.mortbay.jetty_* -%{_datadir}/%{name}/plugins/org.eclipse.equinox.initializer_* -%if %{gcj_support} -%{_libdir}/gcj/%{name}/org.eclipse.ant.core_* -%{_libdir}/gcj/%{name}/org.eclipse.compare_* -%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_* -%{_libdir}/gcj/%{name}/org.eclipse.core.filesystem_* -%{_libdir}/gcj/%{name}/org.eclipse.core.net_* -%{_libdir}/gcj/%{name}/org.eclipse.core.resources_* -%{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_* -%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_* -%{_libdir}/gcj/%{name}/org.eclipse.core.variables_* -%{_libdir}/gcj/%{name}/org.eclipse.debug.core_* -%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.equinox.http.jetty_* -%{_libdir}/gcj/%{name}/org.eclipse.equinox.http.servlet_* -%{_libdir}/gcj/%{name}/org.eclipse.equinox.jsp.jasper_* -%{_libdir}/gcj/%{name}/org.eclipse.equinox.jsp.jasper.registry_* -%{_libdir}/gcj/%{name}/org.eclipse.help.appserver_* -%{_libdir}/gcj/%{name}/org.eclipse.help.base_* -%{_libdir}/gcj/%{name}/org.eclipse.help.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.help.webapp_* -%{_libdir}/gcj/%{name}/org.eclipse.jface.text_* -%{_libdir}/gcj/%{name}/org.eclipse.jsch.core_* -%{_libdir}/gcj/%{name}/org.eclipse.jsch.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.ltk.core.refactoring_* -%{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_* -%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_* -%{_libdir}/gcj/%{name}/org.eclipse.osgi.util_* -%{_libdir}/gcj/%{name}/org.eclipse.search_* -%{_libdir}/gcj/%{name}/org.eclipse.team.core_* -%{_libdir}/gcj/%{name}/org.eclipse.team.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.text_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.browser_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.console_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.editors_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.ide.application_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.intro_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.navigator_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.navigator.resources_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.net_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.presentations.r21_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.views_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.views.properties.tabbed_* -%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_* -%{_libdir}/gcj/%{name}/org.eclipse.update.core_* -%{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_* -%{_libdir}/gcj/%{name}/org.eclipse.update.ui_* -%{_libdir}/gcj/%{name}/compatibility.* -%{_libdir}/gcj/%{name}/org.eclipse.equinox.http.registry_* -%{_libdir}/gcj/%{name}/org.eclipse.equinox.initializer_* -%{_libdir}/gcj/%{name}/platform.jar.* -%{_libdir}/gcj/%{name}/runtime_registry_compatibility.jar.* -%{_libdir}/gcj/%{name}/tomcatwrapper.jar.* -%{_libdir}/gcj/%{name}/universal.jar.* -%endif +%{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_* +%{_libdir}/%{name}/plugins/org.eclipse.update.ui_* +%{_libdir}/%{name}/plugins/org.mortbay.jetty_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.initializer_* +%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_* +%{_libdir}/%{name}/plugins/org.eclipse.cvs_* +%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_* +%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh_* +%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ui_* +%{_libdir}/%{name}/features/org.eclipse.cvs_* +%{_libdir}/%{name}/features/org.eclipse.help_* +%{_libdir}/%{name}/plugins/org.apache.jasper_* %files jdt %defattr(-,root,root) %{_bindir}/efj -%{_datadir}/%{name}/features/org.eclipse.jdt_* -%{_datadir}/%{name}/plugins/org.eclipse.ant.ui_* -%{_datadir}/%{name}/plugins/org.junit_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.user_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.core_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.ui_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.debug_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit4.runtime_* -%{_datadir}/%{name}/plugins/org.junit4_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.launching_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.core.manipulation_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.ui_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.debug.ui_* -%if %{gcj_support} -%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.apt.core_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.junit4.runtime_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.junit.runtime_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.junit_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.core.manipulation_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.apt.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_* -%{_libdir}/gcj/%{name}/jdimodel.jar.* -%{_libdir}/gcj/%{name}/jdi.jar.* -%else -%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_* -%endif +%{_libdir}/%{name}/features/org.eclipse.jdt_* +%{_libdir}/%{name}/plugins/org.eclipse.ant.ui_* +%{_libdir}/%{name}/plugins/org.junit_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.user_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.core_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit4.runtime_* +%{_libdir}/%{name}/plugins/org.junit4_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.core.manipulation_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_* +%{_libdir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_* +%{_libdir}/%{name}/features/org.eclipse.equinox.p2.user.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.director_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.core_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.engine_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.jarprocessor_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata.repository_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.artifact.repository_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.exemplarysetup_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.natives_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin.equinox_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.console_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatechecker_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.garbagecollector_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.directorywatcher_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.reconciler.dropins_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata.generator_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatesite_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.security_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.security.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.extensionlocation_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.director.app_* +%{_libdir}/%{name}/plugins/org.eclipse.ecf.provider.filetransfer_* +%{_libdir}/%{name}/plugins/org.eclipse.ecf.provider.filetransfer.ssl_* +%{_libdir}/%{name}/plugins/org.eclipse.ecf.ssl_* +%{_libdir}/%{name}/plugins/org.eclipse.ecf_* +%{_libdir}/%{name}/plugins/org.eclipse.ecf.filetransfer_* +%{_libdir}/%{name}/plugins/org.eclipse.ecf.identity_* +# FIXME: These need to be symlinks +# SAT4J review request: +# https://bugzilla.redhat.com/show_bug.cgi?id=453781 +%{_libdir}/%{name}/plugins/org.sat4j.core_* +%{_libdir}/%{name}/plugins/org.sat4j.pb_* %files pde %defattr(-,root,root) -%{_datadir}/%{name}/features/org.eclipse.sdk_* -%{_datadir}/%{name}/features/org.eclipse.pde_* -%{_datadir}/%{name}/features/org.eclipse.pde.source_* +%{_libdir}/%{name}/features/org.eclipse.sdk_* +%{_libdir}/%{name}/features/org.eclipse.pde_* +%{_libdir}/%{name}/features/org.eclipse.pde.p2_* +%{_libdir}/%{name}/features/org.eclipse.pde.p2.source_* +%{_libdir}/%{name}/features/org.eclipse.equinox.p2.user.ui.source_* +%{_libdir}/%{name}/features/org.eclipse.help.source_* +%{_libdir}/%{name}/features/org.eclipse.pde.source_* %{_libdir}/%{name}/plugins/org.eclipse.pde.doc.user_* -%{_datadir}/%{name}/plugins/org.eclipse.pde.build_* -%{_datadir}/%{name}/plugins/org.eclipse.pde.build -%{_datadir}/%{name}/plugins/org.eclipse.pde_* -%{_datadir}/%{name}/plugins/org.eclipse.pde.core_* -%{_datadir}/%{name}/plugins/org.eclipse.pde.junit.runtime_* -%{_datadir}/%{name}/plugins/org.eclipse.pde.ui_* -%{_datadir}/%{name}/plugins/org.eclipse.pde.ui.templates_* -%{_datadir}/%{name}/features/org.eclipse.rcp.source_* -%{_libdir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.%{eclipse_arch}* -%{_datadir}/%{name}/plugins/org.eclipse.rcp.source_* -%{_datadir}/%{name}/plugins/org.eclipse.pde.source_* -%{_datadir}/%{name}/features/org.eclipse.cvs.source_* -%{_datadir}/%{name}/plugins/org.eclipse.cvs.source_* -%{_datadir}/%{name}/plugins/org.eclipse.sdk_* -%{_datadir}/%{name}/features/org.eclipse.jdt.source_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.build_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.build +%{_libdir}/%{name}/plugins/org.eclipse.pde_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.core_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.junit.runtime_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.ui_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.ui.templates_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.p2.ui_* +%{_libdir}/%{name}/features/org.eclipse.rcp.source_* +#%{_libdir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.%{eclipse_arch}* +%{_libdir}/%{name}/features/org.eclipse.cvs.source_* +%{_libdir}/%{name}/plugins/org.eclipse.sdk_* +%{_libdir}/%{name}/features/org.eclipse.jdt.source_* %{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.isv_* -%{_datadir}/%{name}/plugins/org.eclipse.jdt.source_* -%{_datadir}/%{name}/plugins/org.junit.source_* -%{_datadir}/%{name}/features/org.eclipse.platform.source_* -%{_datadir}/%{name}/plugins/javax.servlet.jsp.source_* -%{_datadir}/%{name}/plugins/javax.servlet.source_* -%{_datadir}/%{name}/plugins/org.apache.ant.source_* -%{_datadir}/%{name}/plugins/org.apache.commons.el.source_* -%{_datadir}/%{name}/plugins/org.apache.commons.logging.source_* -%{_datadir}/%{name}/plugins/org.apache.jasper.source_* -%{_datadir}/%{name}/plugins/org.apache.lucene.analysis.source_* -%{_datadir}/%{name}/plugins/org.apache.lucene.source_* +%{_libdir}/%{name}/features/org.eclipse.platform.source_* %{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_* -%{_libdir}/%{name}/plugins/org.eclipse.platform.source_* -%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.%{eclipse_arch}_* -%{_datadir}/%{name}/plugins/org.mortbay.jetty.source_* -%{_datadir}/%{name}/buildscripts -%if %{gcj_support} -%{_libdir}/gcj/%{name}/org.eclipse.pde_* -%{_libdir}/gcj/%{name}/org.eclipse.pde.core_* -%{_libdir}/gcj/%{name}/org.eclipse.pde.junit.runtime_* -%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_* -%{_libdir}/gcj/%{name}/org.eclipse.pde.ui.templates_* -%{_libdir}/gcj/%{name}/org.eclipse.platform.doc.isv_* -%{_libdir}/gcj/%{name}/pdebuild.jar* -%{_libdir}/gcj/%{name}/pdebuild-ant.jar* -%endif +#%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.%{eclipse_arch}_* +%{_libdir}/%{name}/plugins/org.eclipse.ui.views.log_* +%{_libdir}/%{name}/buildscripts +%{_libdir}/%{name}/plugins/org.eclipse.pde.api.tools_* +%{_libdir}/%{name}/plugins/org.eclipse.pde.api.tools.ui_* +%{_libdir}/%{name}/plugins/javax.servlet.jsp.source_* +%{_libdir}/%{name}/plugins/javax.servlet.source_* +%{_libdir}/%{name}/plugins/org.apache.ant.source_* +%{_libdir}/%{name}/plugins/org.apache.commons.el.source_* +%{_libdir}/%{name}/plugins/org.apache.commons.logging.source_* +%{_libdir}/%{name}/plugins/org.apache.jasper.source_* +%{_libdir}/%{name}/plugins/org.apache.lucene.analysis.source_* +%{_libdir}/%{name}/plugins/org.apache.lucene.source_* +%{_libdir}/%{name}/plugins/org.junit.source_* +%{_libdir}/%{name}/plugins/org.junit4.source_* +%{_libdir}/%{name}/plugins/org.mortbay.jetty.source_* +%{_libdir}/%{name}/plugins/org.objectweb.asm_* +%{_libdir}/%{name}/plugins/org.objectweb.asm.source_* +%{_libdir}/%{name}/plugins/org.eclipse.*.source_* +# FIXME: where should this go? +%{_libdir}/%{name}/configuration/org.eclipse.equinox.source/source.info %files pde-runtime %defattr(-,root,root) -%{_datadir}/%{name}/plugins/org.eclipse.pde.runtime_* -%if %{gcj_support} -%{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_* -%endif +%{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_* %changelog +* Mon Jul 14 2008 Andrew Overholt 3.4.0-1 +- 3.4 +- Remove gcj compilation +- Update versions of dependencies +- Rename libswt3-gtk2 to eclipse-swt +- Move "Provides: eclipse" to PDE from JDT +- Remove unnecessary old Obsoletes/Provides +- Remove tomcat stuff since it's no longer used +- Move stuff from %%{_datadir}/eclipse to %%{_libdir}/eclipse +- Add BRs/Rs on objectweb-asm and sat4j +- Build ECF filetransfer stuff as part of this SRPM until we have a + separate eclipse-ecf package (which will require this version of the + SDK) + * Sat Jun 14 2008 Dennis Gilmore 3.3.2-13 - make changes to support sparcv9 diff --git a/fetch-ecf.sh b/fetch-ecf.sh new file mode 100644 index 0000000..0d9b47e --- /dev/null +++ b/fetch-ecf.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +for f in \ + org.eclipse.ecf \ + org.eclipse.ecf.core.identity \ + org.eclipse.ecf.filetransfer \ + org.eclipse.ecf.provider.filetransfer \ + org.eclipse.ecf.provider.filetransfer.ssl \ + org.eclipse.ecf.ssl \ +; do +cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/technology \ +export -r v20080611-1715 org.eclipse.ecf/plugins/$f; +done + +tar cjf ecf-filetransfer-v20080611-1715.tar.bz2 org.eclipse.ecf diff --git a/sources b/sources index 39b249a..cbfb7c3 100644 --- a/sources +++ b/sources @@ -1,4 +1,5 @@ e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2 28c8d625ea1af348cfc592369d52284c org.fedoraproject.ide.feature-1.0.0.zip -4b7016cf9aedf07b8f34b39470947799 eclipse-sourceBuild-srcIncluded-3.3.2.zip -08529425250f218c59acd622728b9b44 org.fedoraproject.ide.platform-3.3.2.zip +611d3dc63e9e4246e325848d32773132 ecf-filetransfer-v20080611-1715.tar.bz2 +555c99aee06fc52d2ec03995b5ac0710 eclipse-sourceBuild-srcIncluded-3.4.zip +d596a6e86ee2fd9c9af9b25b334936fa org.fedoraproject.ide.platform-3.4.0.zip