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

- 3.2.0.

Browse Source 
- Remove Provides: eclipse-sdk from eclipse-platform.
- Use build-jar-repository where appropriate.
This commit is contained in:
Andrew Overholt 2006-07-04 21:27:47 +00:00
parent 9c1c163999
commit 16c113bfd3
6 changed files with 1970 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -1,2 +1,2 @@
eclipse-sourceBuild-srcIncluded-3.2RC7.zip eclipse-sourceBuild-srcIncluded-3.2.zip
eclipse-fedora-splash-3.2rc7.png eclipse-fedora-splash-3.2.png

165
eclipse-tomcat55-build.patch Normal file
View File

@ -0,0 +1,165 @@
--- build.xml.orig 2006-07-04 16:09:31.000000000 -0400
+++ build.xml 2006-07-04 16:14:19.000000000 -0400
@@ -58,7 +58,7 @@
<antcall target="gather.bin.parts">
<param name="destination.temp.folder" value="${temp.folder}/"/>
</antcall>
- <zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" filesonly="false" whenempty="skip" update="false"/>
+ <zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.15.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" filesonly="false" whenempty="skip" update="false"/>
<delete dir="${temp.folder}"/>
</target>
@@ -144,50 +144,51 @@
<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xalan1.jar"/>
<pathelement path="../org.apache.ant/lib/ant-xslp.jar"/>
<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xslp.jar"/>
- <pathelement path="catalina.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/catalina.jar"/>
- <pathelement path="bootstrap.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/bootstrap.jar"/>
- <pathelement path="commons-beanutils.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-beanutils.jar"/>
- <pathelement path="commons-collections.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-collections.jar"/>
- <pathelement path="commons-digester.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-digester.jar"/>
- <pathelement path="commons-logging-api.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-logging-api.jar"/>
- <pathelement path="commons-modeler.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-modeler.jar"/>
- <pathelement path="jakarta-regexp-1.3.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-regexp-1.3.jar"/>
- <pathelement path="jasper-compiler.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper-compiler.jar"/>
- <pathelement path="jasper-runtime.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper-runtime.jar"/>
- <pathelement path="mx4j-jmx.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/mx4j-jmx.jar"/>
- <pathelement path="naming-common.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-common.jar"/>
- <pathelement path="naming-factory.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-factory.jar"/>
- <pathelement path="naming-resources.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-resources.jar"/>
- <pathelement path="servlet.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlet.jar"/>
- <pathelement path="servlets-common.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-common.jar"/>
- <pathelement path="servlets-default.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-default.jar"/>
- <pathelement path="servlets-invoker.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-invoker.jar"/>
- <pathelement path="servlets-manager.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-manager.jar"/>
- <pathelement path="tomcat-coyote.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-coyote.jar"/>
- <pathelement path="tomcat-http11.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-http11.jar"/>
- <pathelement path="tomcat-util.jar"/>
- <pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-util.jar"/>
+ <pathelement path="lib/catalina.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/catalina.jar"/>
+ <pathelement path="lib/catalina-optional.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/catalina-optional.jar"/>
+ <pathelement path="lib/commons-beanutils.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-beanutils.jar"/>
+ <pathelement path="lib/commons-collections.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-collections.jar"/>
+ <pathelement path="lib/commons-digester.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-digester.jar"/>
+ <pathelement path="lib/commons-digester-rss.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-digester-rss.jar"/>
+ <pathelement path="lib/commons-el.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-el.jar"/>
+ <pathelement path="lib/commons-logging-api.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-logging-api.jar"/>
+ <pathelement path="lib/commons-modeler.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-modeler.jar"/>
+ <pathelement path="lib/jasper-compiler.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jasper-compiler.jar"/>
+ <pathelement path="lib/jasper-runtime.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
+ <pathelement path="lib/jmx.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jmx.jar"/>
+ <pathelement path="lib/jsp-api.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jsp-api.jar"/>
+ <pathelement path="lib/naming-factory.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/naming-factory.jar"/>
+ <pathelement path="lib/naming-resources.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/naming-resources.jar"/>
+ <pathelement path="lib/regexp.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/regexp.jar"/>
+ <pathelement path="lib/servlet-api.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlet-api.jar"/>
+ <pathelement path="lib/servlets-default.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlets-default.jar"/>
+ <pathelement path="lib/tomcat-coyote.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-coyote.jar"/>
+ <pathelement path="lib/tomcat-http.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-http.jar"/>
+ <pathelement path="lib/tomcat-util.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-util.jar"/>
+ <pathelement path="lib/servlets-invoker.jar"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlets-invoker.jar"/>
+
</path>
<!-- compile the source code -->
<javac destdir="${temp.folder}/tomcatwrapper.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" >
@@ -224,37 +225,37 @@
</target>
<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
- <copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
+ <mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601"/>
+ <copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" failonerror="true" overwrite="false">
<fileset dir="${build.result.folder}" includes="tomcatwrapper.jar" />
</copy>
- <copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
+ <copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" failonerror="true" overwrite="false">
<fileset dir="${basedir}" includes="conf/,webapps/,plugin.xml,*.jar,plugin.properties,preferences.ini,about.html,META-INF/,about_files/" />
</copy>
- <eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" version="4.1.130.v20060601"/>
+ <eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" version="5.5.15.v20060601"/>
</target>
<target name="build.zips" depends="init">
</target>
<target name="gather.sources" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
- <copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
- <copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false">
+ <mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601"/>
+ <copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" failonerror="false" overwrite="false"/>
+ <copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" failonerror="false" overwrite="false">
<fileset dir="${basedir}" includes="about.html,*.license" />
</copy>
</target>
<target name="gather.logs" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
- <copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
+ <mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601"/>
+ <copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" failonerror="false" overwrite="false"/>
</target>
<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.tomcat of all the zips, jars and logs created.">
<delete file="${build.result.folder}/tomcatwrapper.jar"/>
<delete file="${build.result.folder}/tomcatwrappersrc.zip"/>
- <delete file="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.jar"/>
- <delete file="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip"/>
+ <delete file="${plugin.destination}/org.eclipse.tomcat_5.5.15.v20060601.jar"/>
+ <delete file="${plugin.destination}/org.eclipse.tomcat_5.5.15.v20060601.zip"/>
<delete dir="${temp.folder}"/>
</target>
@@ -277,7 +278,7 @@
<delete>
<fileset dir="${temp.folder}" includes="**/*.bin${logExtension}" />
</delete>
- <zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+ <zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.15.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
<delete dir="${temp.folder}"/>
</target>

1598
eclipse-tomcat55.patch Normal file
View File

File diff suppressed because it is too large Load Diff

87
eclipse-webapp-tomcat55.patch Normal file
View File

@ -0,0 +1,87 @@
Index: build.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/build.xml,v
retrieving revision 1.71
diff -u -r1.71 build.xml
--- build.xml 16 Mar 2006 21:57:15 -0000 1.71
+++ build.xml 4 Jul 2006 18:26:11 -0000
@@ -84,8 +84,8 @@
<pathelement path="../org.eclipse.help"/>
<pathelement path="../org.eclipse.help.base"/>
<pathelement path="../org.eclipse.help.appserver"/>
- <pathelement path="../org.eclipse.tomcat/servlet.jar"/>
- <pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/servletapi5.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
</classpath>
<src path="src/" />
<compilerarg line="-log ${temp.folder}/webapp.jar.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
@@ -141,8 +141,12 @@
<pathelement path="../org.eclipse.help"/>
<pathelement path="../org.eclipse.help.base"/>
<pathelement path="../org.eclipse.help.appserver"/>
- <pathelement path="../org.eclipse.tomcat/servlet.jar"/>
- <pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/servletapi5.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/tomcat-util.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/jspapi.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/commons-el.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/commons-logging.jar"/>
</classpath>
<src path="src_servlets/" />
<compilerarg line="-log ${temp.folder}/WEB-INF/lib/servlets.jar.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
@@ -170,21 +174,19 @@
<!-- generate java code from JSPs -->
<path id="jasper.classpath" >
<pathelement location="../org.apache.ant/lib/ant.jar"/>
- <pathelement location="../org.apache.ant/lib/optional.jar"/>
- <pathelement location="../org.eclipse.tomcat/jasper-compiler.jar" />
- <pathelement location="../org.eclipse.tomcat/jasper-runtime.jar" />
- <pathelement location="../org.eclipse.tomcat/servlet.jar" />
- <pathelement location="../org.eclipse.tomcat/tomcat_util.jar" />
+ <pathelement location="../org.apache.ant/lib/ant-launcher.jar"/>
+ <pathelement location="../org.eclipse.tomcat/lib/jasper-compiler.jar" />
+ <pathelement location="../org.eclipse.tomcat/lib/jasper-runtime.jar" />
+ <pathelement location="../org.eclipse.tomcat/lib/servletapi5.jar" />
</path>
<delete dir="${temp.folder}/jsp.jar.src"/>
<mkdir dir="${temp.folder}/jsp.jar.src"/>
<java
classname="org.apache.jasper.JspC"
fork="true"
- failonerror="false"
+ failonerror="true"
classpathref="jasper.classpath"
output="${temp.folder}/WEB-INF/lib/jsp.jar.bin${logExtension}">
- <arg value="-v3" />
<arg value="-d" /><arg value="${temp.folder}/jsp.jar.src" />
<arg value="-die" />
<arg value="-p" /><arg value="org.eclipse.help.internal.webapp.jsp"/>
@@ -222,8 +224,9 @@
<pathelement path="../org.eclipse.help"/>
<pathelement path="../org.eclipse.help.base"/>
<pathelement path="../org.eclipse.help.appserver"/>
- <pathelement path="../org.eclipse.tomcat/servlet.jar"/>
- <pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/servletapi5.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/jspapi.jar"/>
</classpath>
<src path="${temp.folder}/jsp.jar.src/" />
<compilerarg line="-log ${temp.folder}/WEB-INF/lib/jsp.jar.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
Index: build.properties
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/build.properties,v
retrieving revision 1.32
diff -u -r1.32 build.properties
--- build.properties 18 Mar 2005 08:00:28 -0000 1.32
+++ build.properties 4 Jul 2006 18:26:11 -0000
@@ -33,5 +33,5 @@
../org.eclipse.help.appserver/bin,\
../org.eclipse.help.appserver,\
../org.eclipse.help.appserver/@dot,\
- ../org.eclipse.tomcat/servlet.jar,\
- ../org.eclipse.tomcat/jasper-runtime.jar
+ ../org.eclipse.tomcat/lib/servletapi5.jar,\
+ ../org.eclipse.tomcat/lib/jasper-runtime.jar

245
eclipse.spec
View File

@ -1,3 +1,8 @@
# TODO:
# - migrate compare API patch (patch33) to 3.2 final
# - migrate cairo patch (patch43) to 3.2 final
# - migrate GNU formatter patches (patch20, patch21) to 3.2 final
Epoch: 1 Epoch: 1
%define fedora 1 %define fedora 1
@ -36,16 +41,16 @@ Epoch: 1
Summary: %{pkg_summary} Summary: %{pkg_summary}
Name: eclipse Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro} Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 0jpp_0fc.3.2RC7.7 Release: 1jpp_1fc
License: EPL License: EPL
Group: Text Editors/Integrated Development Environments (IDE) Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/ URL: http://www.eclipse.org/
Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.2RC7-200606021317/eclipse-sourceBuild-srcIncluded-3.2RC7.zip Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/eclipse-sourceBuild-srcIncluded-3.2.zip
Source2: %{name}.desktop Source2: %{name}.desktop
Source5: %{name}-48.png Source5: %{name}-48.png
Source6: %{name}.conf Source6: %{name}.conf
%if %{fedora} %if %{fedora}
Source11: %{name}-fedora-splash-3.2rc7.png Source11: %{name}-fedora-splash-3.2.png
%endif %endif
%if %{redhat} %if %{redhat}
Source11: %{name}-redhat-splash.png Source11: %{name}-redhat-splash.png
@ -56,9 +61,6 @@ Source19: %{name}-filenamepatterns.txt
Source20: ecj.sh.in Source20: ecj.sh.in
Source21: rebuild-sdk-features Source21: rebuild-sdk-features
# Build libswt-mozilla and libswt-cairo and use O2 # Build libswt-mozilla and libswt-cairo and use O2
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
Patch0: %{name}-libswt-enableallandO2.patch Patch0: %{name}-libswt-enableallandO2.patch
@ -83,7 +85,6 @@ Patch38: %{name}-helpindexbuilder.patch
Patch40: %{name}-usebuiltlauncher.patch Patch40: %{name}-usebuiltlauncher.patch
## Build cairo native libs ## Build cairo native libs
#Patch43: %{name}-libswt-cairo1.0-3.patch #Patch43: %{name}-libswt-cairo1.0-3.patch
Patch45: %{name}-webapp-jasper-classpath.patch
Patch46: %{name}-libswt-xpcomgcc4.patch Patch46: %{name}-libswt-xpcomgcc4.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=79592 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=79592
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168726 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168726
@ -101,13 +102,13 @@ Patch53: %{name}-pde.build-add-package-build.patch
# We need to disable junit4 and apt until GCJ can handle Java5 code # We need to disable junit4 and apt until GCJ can handle Java5 code
Patch55: %{name}-disable-junit4-apt.patch Patch55: %{name}-disable-junit4-apt.patch
# these patches need to go upstream # These patches need to go upstream
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371
#Patch28: %{name}-tomcat5.patch Patch28: %{name}-tomcat55.patch
#Patch29: %{name}-tomcat5-build.patch Patch29: %{name}-tomcat55-build.patch
#Patch30: %{name}-tomcat5-build.2.patch Patch30: %{name}-tomcat55-build.2.patch
#Patch50: %{name}-tomcat5-build.3.patch Patch50: %{name}-tomcat55-build.3.patch
#Patch31: %{name}-webapp-tomcat5.patch Patch31: %{name}-webapp-tomcat55.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178726 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178726
Patch33: %{name}-compare-create-api.patch Patch33: %{name}-compare-create-api.patch
@ -122,12 +123,6 @@ Patch22: %{name}-updatehomedir.patch
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
Patch34: %{name}-bz162177.patch Patch34: %{name}-bz162177.patch
# these patches should be in 3.2 final
Patch100: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
Patch101: org.eclipse.platform.doc.isv-rm-org.eclipse.ui.workbench-Eclipse-UI-Components.patch
%if %{gcj_support} %if %{gcj_support}
%else %else
ExclusiveArch: %{ix86} x86_64 ppc ia64 ExclusiveArch: %{ix86} x86_64 ppc ia64
@ -207,8 +202,7 @@ Eclipse compiler for Java.
Summary: Eclipse platform common files Summary: Eclipse platform common files
Group: Text Editors/Integrated Development Environments (IDE) Group: Text Editors/Integrated Development Environments (IDE)
Provides: %{name} = %{epoch}:%{version}-%{release} Provides: %{name} = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-sdk %{name}-ui %{name}-gtk2 %{name}-scripts eclipse Obsoletes: %{name}-ui %{name}-gtk2 %{name}-scripts eclipse
Provides: %{name}-sdk = %{epoch}:%{version}-%{release}
Provides: %{name}-ui = %{epoch}:%{version}-%{release} Provides: %{name}-ui = %{epoch}:%{version}-%{release}
Provides: %{name}-scripts = %{epoch}:%{version}-%{release} Provides: %{name}-scripts = %{epoch}:%{version}-%{release}
Provides: %{name}-gtk2 = %{epoch}:%{version}-%{release} Provides: %{name}-gtk2 = %{epoch}:%{version}-%{release}
@ -386,14 +380,6 @@ Source for RCP for use within Eclipse.
%prep %prep
%setup -q -c %setup -q -c
pushd plugins/org.eclipse.platform.doc.isv
%patch100 -p0
%patch101 -p0
popd
pushd plugins/org.eclipse.platform.doc.user
%patch100 -p0
popd
# I hate spaces in paths with patch! # I hate spaces in paths with patch!
pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
%patch0 -p0 %patch0 -p0
@ -412,14 +398,14 @@ popd
# tomcat patches # tomcat patches
pushd plugins/org.eclipse.tomcat pushd plugins/org.eclipse.tomcat
#%patch28 -p0 %patch28 -p0
#%patch29 -p0 %patch29 -p0
popd
%patch30 -p0
%patch50 -p1
pushd plugins/org.eclipse.help.webapp
%patch31 -p0
popd popd
#%patch30 -p0
#%patch50 -p1
#pushd plugins/org.eclipse.help.webapp
#%patch31 -p0
#popd
pushd plugins/org.eclipse.compare pushd plugins/org.eclipse.compare
#%patch33 -p0 #%patch33 -p0
popd popd
@ -429,7 +415,6 @@ popd
%patch38 -p0 %patch38 -p0
%patch40 -p0 %patch40 -p0
#%patch43 #%patch43
%patch45
pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library
%patch46 %patch46
popd popd
@ -466,7 +451,7 @@ pushd plugins/org.eclipse.swt/Eclipse\ SWT
%patch54 %patch54
popd popd
%patch55 -p1 %patch55 -p0
rm plugins/org.junit4/junit-4.1.jar rm plugins/org.junit4/junit-4.1.jar
pushd plugins/org.eclipse.platform pushd plugins/org.eclipse.platform
@ -588,51 +573,50 @@ rm com.jcraft.jsch_*.jar
popd popd
## BEGIN TOMCAT ## ## BEGIN TOMCAT ##
#rm plugins/org.eclipse.tomcat/commons-beanutils.jar rm plugins/org.eclipse.tomcat/commons-beanutils.jar
#rm plugins/org.eclipse.tomcat/commons-collections.jar rm plugins/org.eclipse.tomcat/commons-collections.jar
#rm plugins/org.eclipse.tomcat/commons-digester.jar rm plugins/org.eclipse.tomcat/commons-digester.jar
#rm plugins/org.eclipse.tomcat/commons-logging-api.jar rm plugins/org.eclipse.tomcat/commons-logging-api.jar
#rm plugins/org.eclipse.tomcat/commons-modeler.jar rm plugins/org.eclipse.tomcat/commons-modeler.jar
#rm plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar rm plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar
#rm plugins/org.eclipse.tomcat/servlet.jar rm plugins/org.eclipse.tomcat/servlet.jar
#rm plugins/org.eclipse.tomcat/servlets-manager.jar rm plugins/org.eclipse.tomcat/servlets-manager.jar
#rm plugins/org.eclipse.tomcat/naming-common.jar rm plugins/org.eclipse.tomcat/naming-common.jar
#rm plugins/org.eclipse.tomcat/servlets-common.jar rm plugins/org.eclipse.tomcat/servlets-common.jar
#rm plugins/org.eclipse.tomcat/tomcat-http11.jar rm plugins/org.eclipse.tomcat/tomcat-http11.jar
#ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar
#ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/catalina.jar ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/catalina.jar
#ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat/catalina-optional.jar ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat/catalina-optional.jar
#ln -s %{_javadir}/jakarta-commons-beanutils.jar plugins/org.eclipse.tomcat/jakarta-commons-beanutils.jar ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat/jasper-compiler.jar
#ln -s %{_javadir}/jakarta-commons-collections.jar plugins/org.eclipse.tomcat/jakarta-commons-collections.jar ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat/jasper-runtime.jar
#ln -s %{_javadir}/jakarta-commons-dbcp.jar plugins/org.eclipse.tomcat/jakarta-commons-dbcp.jar ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat/mx4j.jar
#ln -s %{_javadir}/jakarta-commons-digester.jar plugins/org.eclipse.tomcat/jakarta-commons-digester.jar ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat/mx4j-impl.jar
#ln -s %{_javadir}/jakarta-commons-digester-rss.jar plugins/org.eclipse.tomcat/jakarta-commons-digester-rss.jar ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/mx4j-jmx.jar
#ln -s %{_javadir}/jakarta-commons-el.jar plugins/org.eclipse.tomcat/jakarta-commons-el.jar ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat/naming-common.jar
#ln -s %{_javadir}/jakarta-commons-fileupload.jar plugins/org.eclipse.tomcat/jakarta-commons-fileupload.jar ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat/naming-factory.jar
#ln -s %{_javadir}/jakarta-commons-launcher.jar plugins/org.eclipse.tomcat/jakarta-commons-launcher.jar ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat/naming-resources.jar
#ln -s %{_javadir}/jakarta-commons-logging.jar plugins/org.eclipse.tomcat/jakarta-commons-logging.jar ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat/servlets-common.jar
#ln -s %{_javadir}/jakarta-commons-modeler.jar plugins/org.eclipse.tomcat/jakarta-commons-modeler.jar ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat/servlets-default.jar
#ln -s %{_javadir}/jakarta-commons-pool.jar plugins/org.eclipse.tomcat/jakarta-commons-pool.jar ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat/servlets-invoker.jar
#ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat/jasper-compiler.jar ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/tomcat-coyote.jar
#ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat/jasper-runtime.jar ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/tomcat-http11.jar
#ln -s %{_javadir}/jspapi.jar plugins/org.eclipse.tomcat/jspapi.jar ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/tomcat-util.jar
#ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat/mx4j.jar build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-beanutils
#ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat/mx4j-impl.jar build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-collections
#ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/mx4j-jmx.jar build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-dbcp
#ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat/naming-common.jar build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-digester
#ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat/naming-factory.jar build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-digester-rss
#ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat/naming-resources.jar build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-el
#ln -s %{_javadir}/regexp.jar plugins/org.eclipse.tomcat/regexp.jar build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-fileupload
#ln -s %{_javadir}/servletapi5.jar plugins/org.eclipse.tomcat/servletapi5.jar build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-launcher
#ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat/servlets-common.jar build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-logging
#ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat/servlets-default.jar build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-modeler
#ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat/servlets-invoker.jar build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-pool
#ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/tomcat-coyote.jar build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jspapi
#ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/tomcat-http11.jar build-jar-repository -s -p plugins/org.eclipse.tomcat/lib regexp
#ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/tomcat-util.jar build-jar-repository -s -p plugins/org.eclipse.tomcat/lib servletapi5
## END TOMCAT ## ## END TOMCAT ##
rm plugins/org.junit/junit.jar build-jar-repository -s -p plugins/org.junit junit
ln -s %{_javadir}/junit.jar plugins/org.junit/junit.jar
pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
# /usr/lib -> /usr/lib64 # /usr/lib -> /usr/lib64
@ -645,7 +629,7 @@ popd
find plugins -name \*.xml -exec sed --in-place "s/\(<antcall target=\"build.index\".*\/>\)/<\!-- \1 -->/" "{}" \; find plugins -name \*.xml -exec sed --in-place "s/\(<antcall target=\"build.index\".*\/>\)/<\!-- \1 -->/" "{}" \;
%endif %endif
# nasty hack to get suppport for pcc64 and s390(x) # nasty hack to get suppport for ppc64 and s390(x)
# move all of the ia64 directories to ppc64 or s390(x) dirs and replace the ia64 # strings with ppc64 or s390(x) # move all of the ia64 directories to ppc64 or s390(x) dirs and replace the ia64 # strings with ppc64 or s390(x)
%ifarch ppc64 s390 s390x %ifarch ppc64 s390 s390x
# there is only partial support for ppc64 in 3.2 so we have to remove this # there is only partial support for ppc64 in 3.2 so we have to remove this
@ -1060,52 +1044,50 @@ ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene_*/lucene-1.4.3.jar
#rm plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar #rm plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
#ln -s %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar #ln -s %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
## BEGIN TOMCAT ## ## BEGIN TOMCAT ##
#rm plugins/org.eclipse.tomcat_*/commons-beanutils.jar rm plugins/org.eclipse.tomcat_*/commons-beanutils.jar
#rm plugins/org.eclipse.tomcat_*/commons-collections.jar rm plugins/org.eclipse.tomcat_*/commons-collections.jar
#rm plugins/org.eclipse.tomcat_*/commons-digester.jar rm plugins/org.eclipse.tomcat_*/commons-digester.jar
#rm plugins/org.eclipse.tomcat_*/commons-logging-api.jar rm plugins/org.eclipse.tomcat_*/commons-logging-api.jar
#rm plugins/org.eclipse.tomcat_*/commons-modeler.jar rm plugins/org.eclipse.tomcat_*/commons-modeler.jar
#rm plugins/org.eclipse.tomcat_*/jakarta-regexp-1.3.jar rm plugins/org.eclipse.tomcat_*/jakarta-regexp-1.3.jar
#rm plugins/org.eclipse.tomcat_*/servlet.jar rm plugins/org.eclipse.tomcat_*/servlet.jar
#rm plugins/org.eclipse.tomcat_*/servlets-manager.jar rm plugins/org.eclipse.tomcat_*/servlets-manager.jar
#rm plugins/org.eclipse.tomcat_*/naming-common.jar rm plugins/org.eclipse.tomcat_*/naming-common.jar
#rm plugins/org.eclipse.tomcat_*/servlets-common.jar rm plugins/org.eclipse.tomcat_*/servlets-common.jar
#rm plugins/org.eclipse.tomcat_*/tomcat-http11.jar rm plugins/org.eclipse.tomcat_*/tomcat-http11.jar
#ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/bootstrap.jar ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/bootstrap.jar
#ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/catalina.jar ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/catalina.jar
#ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_*/catalina-optional.jar ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_*/catalina-optional.jar
#ln -s %{_javadir}/jakarta-commons-beanutils.jar plugins/org.eclipse.tomcat_*/jakarta-commons-beanutils.jar ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat_*/jasper-compiler.jar
#ln -s %{_javadir}/jakarta-commons-collections.jar plugins/org.eclipse.tomcat_*/jakarta-commons-collections.jar ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat_*/jasper-runtime.jar
#ln -s %{_javadir}/jakarta-commons-dbcp.jar plugins/org.eclipse.tomcat_*/jakarta-commons-dbcp.jar ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_*/mx4j.jar
#ln -s %{_javadir}/jakarta-commons-digester.jar plugins/org.eclipse.tomcat_*/jakarta-commons-digester.jar ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_*/mx4j-impl.jar
#ln -s %{_javadir}/jakarta-commons-digester-rss.jar plugins/org.eclipse.tomcat_*/jakarta-commons-digester-rss.jar ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_*/mx4j-jmx.jar
#ln -s %{_javadir}/jakarta-commons-el.jar plugins/org.eclipse.tomcat_*/jakarta-commons-el.jar ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat_*/naming-common.jar
#ln -s %{_javadir}/jakarta-commons-fileupload.jar plugins/org.eclipse.tomcat_*/jakarta-commons-fileupload.jar ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_*/naming-factory.jar
#ln -s %{_javadir}/jakarta-commons-launcher.jar plugins/org.eclipse.tomcat_*/jakarta-commons-launcher.jar ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_*/naming-resources.jar
#ln -s %{_javadir}/jakarta-commons-logging.jar plugins/org.eclipse.tomcat_*/jakarta-commons-logging.jar ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat_*/servlets-common.jar
#ln -s %{_javadir}/jakarta-commons-modeler.jar plugins/org.eclipse.tomcat_*/jakarta-commons-modeler.jar ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/servlets-default.jar
#ln -s %{_javadir}/jakarta-commons-pool.jar plugins/org.eclipse.tomcat_*/jakarta-commons-pool.jar ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/servlets-invoker.jar
#ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat_*/jasper-compiler.jar ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/tomcat-coyote.jar
#ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat_*/jasper-runtime.jar ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/tomcat-http11.jar
#ln -s %{_javadir}/jspapi.jar plugins/org.eclipse.tomcat_*/jspapi.jar ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/tomcat-util.jar
#ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_*/mx4j.jar build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-beanutils
#ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_*/mx4j-impl.jar build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-collections
#ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_*/mx4j-jmx.jar build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-dbcp
#ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat_*/naming-common.jar build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-digester
#ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_*/naming-factory.jar build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-digester-rss
#ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_*/naming-resources.jar build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-el
#ln -s %{_javadir}/regexp.jar plugins/org.eclipse.tomcat_*/regexp.jar build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-fileupload
#ln -s %{_javadir}/servletapi5.jar plugins/org.eclipse.tomcat_*/servletapi5.jar build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-launcher
#ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat_*/servlets-common.jar build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-logging
#ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/servlets-default.jar build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-modeler
#ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/servlets-invoker.jar build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-pool
#ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/tomcat-coyote.jar build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jspapi
#ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/tomcat-http11.jar build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib regexp
#ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/tomcat-util.jar build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib servletapi5
## END TOMCAT ## ## END TOMCAT ##
# FIXME rm -f in ln build-jar-repository -s -p plugins/org.junit_* junit
#rm plugins/org.junit_*/junit.jar
ln -sf %{_javadir}/junit.jar plugins/org.junit_*/junit.jar
# Symlink org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar in # Symlink org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar in
# %{_datadir}/java/eclipse-ecj.jar for java-1.4.2-gcj-compat's "javac" # %{_datadir}/java/eclipse-ecj.jar for java-1.4.2-gcj-compat's "javac"
@ -1139,7 +1121,7 @@ popd
%if %{gcj_support} %if %{gcj_support}
%ifarch ia64 %ifarch ia64
# FIXME: auto get version number; tweak aot-compile-rpm to fix this # FIXME: auto get version number; tweak aot-compile-rpm to fix this
aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_3.2.0.I200606011710.jar aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_3.2.0.M20060628.jar
%else %else
aot-compile-rpm aot-compile-rpm
%endif %endif
@ -1630,6 +1612,11 @@ fi
%endif %endif
%changelog %changelog
* Tue Jul 04 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-1jpp_1fc
- 3.2.0.
- Remove Provides: eclipse-sdk from eclipse-platform.
- Use build-jar-repository where appropriate.
* Tue Jun 13 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-0jpp_0fc.3.2RC7.7 * Tue Jun 13 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-0jpp_0fc.3.2RC7.7
- Rename -devel packages to -sdk to match upstream names. - Rename -devel packages to -sdk to match upstream names.
- Add Provides eclipse-sdk to platform-sdk. - Add Provides eclipse-sdk to platform-sdk.

4
sources
View File

@ -1,2 +1,2 @@
9fa62b56c209713a32296f3ac65cf1d0 eclipse-sourceBuild-srcIncluded-3.2RC7.zip 67b41802092d4b2f779fb756dcaec85c eclipse-sourceBuild-srcIncluded-3.2.zip
f7837f724789b30537d2afe1b8b77161 eclipse-fedora-splash-3.2rc7.png 5839c46d1080ddd08d3de669e2091189 eclipse-fedora-splash-3.2.png