rpms/eclipse/devel ecf-filetransfer-build.properties, NONE, 1.1 ecf-filetransfer-feature.xml, NONE, 1.1 eclipse-compilelibs.patch, NONE, 1.1 eclipse-config.ini.director, NONE, 1.1 eclipse-dontpackicu4jsource.patch, NONE, 1.1 eclipse-ecf-qualifier.patch, NONE, 1.1 eclipse-nojarsignatures.patch, NONE, 1.1 eclipse-pdeapicasting-ui.patch, NONE, 1.1 eclipse-pdeapicasting.patch, NONE, 1.1 fetch-ecf.sh, NONE, 1.1 .cvsignore, 1.46, 1.47 eclipse-memorypermsizeandjvmcrash.patch, 1.1, 1.2 eclipse.in, 1.4, 1.5 eclipse.spec, 1.530, 1.531 sources, 1.59, 1.60
Andrew Overholt (overholt)
fedora-extras-commits at redhat.com
Mon Jul 14 21:41:18 UTC 2008
Author: overholt
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20568
Modified Files:
.cvsignore eclipse-memorypermsizeandjvmcrash.patch eclipse.in
eclipse.spec sources
Added Files:
ecf-filetransfer-build.properties ecf-filetransfer-feature.xml
eclipse-compilelibs.patch eclipse-config.ini.director
eclipse-dontpackicu4jsource.patch eclipse-ecf-qualifier.patch
eclipse-nojarsignatures.patch eclipse-pdeapicasting-ui.patch
eclipse-pdeapicasting.patch fetch-ecf.sh
Log Message:
* Mon Jul 14 2008 Andrew Overholt <overholt at redhat.com> 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)
--- NEW FILE ecf-filetransfer-build.properties ---
bin.includes = feature.xml
--- NEW FILE ecf-filetransfer-feature.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.ecf.filetransfer_feature"
label="ECF filetransfer"
version="2.0.0">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
</description>
<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
<license url="http://www.example.com/license">
[Enter License Description here.]
</license>
<plugin
id="org.eclipse.ecf"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ecf.filetransfer"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ecf.identity"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ecf.provider.filetransfer"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ecf.provider.filetransfer.ssl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.eclipse.ecf.ssl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
</feature>
eclipse-compilelibs.patch:
--- NEW FILE eclipse-compilelibs.patch ---
### 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 @@
<project name="Eclipse SDK Source Build" default="run" basedir=".">
<!-- default target that runs complete build -->
- <target name="run" depends="fetch,insertBuildId,compile,install" />
+ <target name="run" depends="fetch,insertBuildId,compile,compilelibs,install" />
<!-- all features required to build eclipse sdk and javadoc -->
<target name="allElements">
@@ -71,6 +71,37 @@
<record name="compilelog.txt" action="stop" />
</target>
+ <target name="compilelibs" depends="init,clean,compile" if="libsconfig">
+ <property name="swtlibs" value="${buildDirectory}/swttmp" />
+ <mkdir dir="${swtlibs}" />
+
+ <ant antfile="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}/build.xml" target="build.nativeLibraries" dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
+
+ <property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
+ <exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true">
+ <arg line="build.sh" />
+ </exec>
+ <copy file="${launcherlibs}/library/${installWs}/eclipse" todir="${buildDirectory}/eclipse/" />
+
+ <property name="launcherfragment" value="org.eclipse.equinox.launcher.${installWs}.${installOs}.${installArch}" />
+
+ <copy file="${launcherlibs}/library/${installWs}/eclipse" todir="features/org.eclipse.equinox.executable/contributed/${installWs}/${installOs}/${installArch}/" />
+ <copy todir="${buildDirectory}/plugins/${launcherfragment}">
+ <fileset dir="${launcherlibs}/library/${installWs}">
+ <include name="**/*.so" />
+ </fileset>
+ </copy>
+
+ <!-- build liblocalfile -->
+ <exec dir="plugins/org.eclipse.core.filesystem/natives/unix/${installOs}" executable="make" failonerror="true" />
+ <move file="plugins/org.eclipse.core.filesystem/natives/unix/${installOs}/liblocalfile_1_0_0.so" todir="plugins/org.eclipse.core.filesystem.${installOs}.${installArch}/os/${installOs}/${installArch}">
+ </move>
+ <!-- build libupdate -->
+ <ant dir="plugins/org.eclipse.update.core.${installOs}/src" antfile="build.xml" />
+
+ </target>
+
+
<!--create an installable eclipse runtime-->
<target name="install" depends="init">
<echo message="Assembling..." />
@@ -174,7 +205,7 @@
<target name="install.eclipse.zip">
<exec dir="${buildDirectory}" executable="unzip" failonerror="true">
- <arg line="-qq ${buildDirectory}/${buildLabel}/*.zip" />
+ <arg line="-qq -o ${buildDirectory}/${buildLabel}/*.zip" />
</exec>
</target>
--- NEW FILE eclipse-config.ini.director ---
# 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/<locale> 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
# <URL | simple bundle location>[@ [<startlevel>] [":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 at start,\
org.eclipse.equinox.common,\
org.eclipse.equinox.frameworkadmin,\
org.eclipse.equinox.frameworkadmin.equinox at 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 at 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 at 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
eclipse-dontpackicu4jsource.patch:
--- NEW FILE eclipse-dontpackicu4jsource.patch ---
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 at org.eclipse.rcp.source = org.eclipse.rcp,plugin at com.ibm.icu.source;version=3.8.1.qualifier;unpack="false"
+generate.feature at org.eclipse.rcp.source = org.eclipse.rcp,plugin at 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 at org.eclipse.rcp.source = org.eclipse.rcp,plugin at com.ibm.icu.source;version=3.8.1.qualifier;unpack="false"
+generate.feature at org.eclipse.rcp.source = org.eclipse.rcp,plugin at com.ibm.icu.source;version=3.8.1.qualifier
eclipse-ecf-qualifier.patch:
--- NEW FILE eclipse-ecf-qualifier.patch ---
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",
eclipse-nojarsignatures.patch:
--- NEW FILE eclipse-nojarsignatures.patch ---
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=
-
eclipse-pdeapicasting-ui.patch:
--- NEW FILE eclipse-pdeapicasting-ui.patch ---
### 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);
}
});
eclipse-pdeapicasting.patch:
--- NEW FILE eclipse-pdeapicasting.patch ---
### 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];
--- NEW FILE fetch-ecf.sh ---
#!/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 at 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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore 3 Apr 2008 15:48:11 -0000 1.46
+++ .cvsignore 14 Jul 2008 21:40:29 -0000 1.47
@@ -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
eclipse-memorypermsizeandjvmcrash.patch:
Index: eclipse-memorypermsizeandjvmcrash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-memorypermsizeandjvmcrash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-memorypermsizeandjvmcrash.patch 25 Apr 2008 16:55:36 -0000 1.1
+++ eclipse-memorypermsizeandjvmcrash.patch 14 Jul 2008 21:40:30 -0000 1.2
@@ -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
Index: eclipse.in
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse.in 27 Jun 2007 15:56:57 -0000 1.4
+++ eclipse.in 14 Jul 2008 21:40:30 -0000 1.5
@@ -1,6 +1,4 @@
#!/bin/sh
exec @LIBDIR@/eclipse/eclipse \
- --launcher.library @LIBDIR@/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux. at ECLIPSELIBSUFFIX@ \
- -startup /usr/share/eclipse/startup.jar \
${1+"$@"}
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.530 -r 1.531 eclipse.spec
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -r1.530 -r1.531
--- eclipse.spec 20 Jun 2008 21:54:45 -0000 1.530
+++ eclipse.spec 14 Jul 2008 21:40:30 -0000 1.531
@@ -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 @@
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 at 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 at sources.redhat.com:/cvs/eclipse export \
@@ -51,9 +51,19 @@
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 @@
# 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 @@
# 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: 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-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 @@
[...1879 lines suppressed...]
-%{_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 <overholt at redhat.com> 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 <dennis at ausil.us> 3.3.2-13
- make changes to support sparcv9
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources 3 Apr 2008 15:48:11 -0000 1.59
+++ sources 14 Jul 2008 21:40:30 -0000 1.60
@@ -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
More information about the fedora-extras-commits
mailing list