- Re-add customBuildCallbacks.xml-add-pre.gather.bin.parts.patch because it
has not been applied upstream.
- Minor spec file clean ups.
- Add %{name} to the -devel package Provides so that upgrading from FC-5 to
FC-6 works.
- Re-enable natively compiling the ant.ui plugin.
- Re-enable natively compiling the team.cvs.core plugin on ia64.
- Remove Eclipse-UI-Components patch.
- Remove outdated README.
This commit is contained in:
Ben Konrath
parent
19e4982f56
commit
681f7e50b4
91
eclipse.spec
91
eclipse.spec
|
|
@ -27,20 +27,11 @@ Epoch: 1
|
|||
%else
|
||||
%define eclipse_arch %{_arch}
|
||||
%endif
|
||||
%if %{gcj_support}
|
||||
%ifarch %{ix86} x86_64 ppc
|
||||
%define native_ecj 1
|
||||
%else
|
||||
%define native_ecj 0
|
||||
%endif
|
||||
%else
|
||||
%define native_ecj 0
|
||||
%endif
|
||||
|
||||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
License: EPL
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
|
|
@ -52,7 +43,7 @@ Source6: %{name}.conf
|
|||
Source11: %{name}-fedora-splash-3.2.png
|
||||
%endif
|
||||
%if %{redhat}
|
||||
Source11: %{name}-redhat-splash.png
|
||||
Source11: %{name}-redhat-splash-3.2.png
|
||||
%endif
|
||||
Source16: %{name}-copy-platform.sh
|
||||
Source17: efj.sh.in
|
||||
|
|
@ -124,6 +115,7 @@ Patch57: %{name}-ecj-gcj.patch
|
|||
# firefox-devel's firefox-xpcom.pc needs to include -I<blah>/embed_base
|
||||
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200929
|
||||
Patch58: %{name}-libswt-xpcom.patch
|
||||
Patch100: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
|
||||
|
||||
%if %{gcj_support}
|
||||
%else
|
||||
|
|
@ -240,8 +232,9 @@ former eclipse-gtk2 package).
|
|||
%package platform-sdk
|
||||
Summary: Eclipse platform Source
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Provides: platform-devel
|
||||
Obsoletes: platform-devel
|
||||
# FIXME: these Provides and Obsoletes can be removed when FC-5 goes into legacy
|
||||
Provides: %{name}-platform-devel
|
||||
Obsoletes: %{name}-platform-devel
|
||||
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
|
|
@ -272,8 +265,9 @@ Eclipse Java developments tools.
|
|||
%package jdt-sdk
|
||||
Summary: Eclipse JDT Source
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Provides: jdt-devel
|
||||
Obsoletes: jdt-devel
|
||||
# FIXME: these Provides and Obsoletes can be removed when FC-5 goes into legacy
|
||||
Provides: %{name}-jdt-devel
|
||||
Obsoletes: %{name}-jdt-devel
|
||||
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
|
|
@ -321,8 +315,9 @@ Eclipse Plug-in Development Environment runtime plugin (org.eclipse.pde.runtime)
|
|||
Summary: Eclipse PDE Source
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Provides: %{name}-sdk
|
||||
Provides: pde-devel
|
||||
Obsoletes: pde-devel
|
||||
# FIXME: these Provides and Obsoletes can be removed when FC-5 goes into legacy
|
||||
Provides: %{name}-pde-devel
|
||||
Obsoletes: %{name}-pde-devel
|
||||
Requires: %{name}-pde = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
|
||||
Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
|
||||
|
|
@ -363,8 +358,9 @@ Eclipse Rich Client Platform
|
|||
%package rcp-sdk
|
||||
Summary: Eclipse RCP Source
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Provides: rcp-devel
|
||||
Obsoletes: rcp-devel
|
||||
# FIXME: these Provides and Obsoletes can be removed when FC-5 goes into legacy
|
||||
Provides: %{name}-rcp-devel
|
||||
Obsoletes: %{name}-rcp-devel
|
||||
Requires: %{name}-rcp = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
|
||||
|
||||
|
|
@ -457,6 +453,14 @@ popd
|
|||
%patch55 -p0
|
||||
rm plugins/org.junit4/junit-4.1.jar
|
||||
|
||||
# FIXME check if this has been applied upstream
|
||||
pushd plugins/org.eclipse.platform.doc.isv
|
||||
%patch100 -p0
|
||||
popd
|
||||
pushd plugins/org.eclipse.platform.doc.user
|
||||
%patch100 -p0
|
||||
popd
|
||||
|
||||
pushd plugins/org.eclipse.platform
|
||||
cp %{SOURCE11} splash.bmp
|
||||
popd
|
||||
|
|
@ -646,7 +650,8 @@ popd
|
|||
%endif
|
||||
|
||||
# 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
|
||||
# there is only partial support for ppc64 in 3.2 so we have to remove this
|
||||
# partial support to get the replacemnt hack to work
|
||||
|
|
@ -691,7 +696,8 @@ env
|
|||
ORIGCLASSPATH=$CLASSPATH
|
||||
|
||||
# finish the jsch plugin build
|
||||
#FIXME remove version numbers
|
||||
# FIXME remove version numbers
|
||||
# FIXME jar -V does not work for proprietary VMs
|
||||
pushd baseLocation/plugins/com.jcraft.jsch_0.1.28.jar-build
|
||||
unzip -qq %{_javadir}/jsch.jar -x META-INF\*
|
||||
sed --in-place "s/$(grep Created-By: META-INF/MANIFEST.MF)/Created-By: $(jar -V | head -1)/" META-INF/MANIFEST.MF
|
||||
|
|
@ -723,24 +729,20 @@ rm -r baseLocation/plugins/com.jcraft.jsch_0.1.28.jar-build
|
|||
# Delete our modified ecj and restore the backup
|
||||
rm -rf ecj-bootstrap-tmp
|
||||
|
||||
%if %{native_ecj}
|
||||
# 1b. Natively-compile it
|
||||
gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
|
||||
-o ecj-bootstrap.jar.so ecj-bootstrap.jar
|
||||
|
||||
gcj-dbtool -n ecj-bootstrap.db 30000
|
||||
gcj-dbtool -a ecj-bootstrap.db ecj-bootstrap.jar{,.so}
|
||||
%endif
|
||||
# 1b. Natively-compile it
|
||||
gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
|
||||
-o ecj-bootstrap.jar.so ecj-bootstrap.jar
|
||||
|
||||
gcj-dbtool -n ecj-bootstrap.db 30000
|
||||
gcj-dbtool -a ecj-bootstrap.db ecj-bootstrap.jar{,.so}
|
||||
|
||||
# 2a. Build ecj
|
||||
export CLASSPATH=ecj-bootstrap.jar:$ORIGCLASSPATH
|
||||
%if %{native_ecj}
|
||||
export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db"
|
||||
%endif
|
||||
%endif
|
||||
ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
|
||||
|
||||
%if %{native_ecj}
|
||||
%if %{gcj_support}
|
||||
# 2b. Natively-compile ecj
|
||||
gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
|
||||
-o jdtcoresrc/ecj.jar.so jdtcoresrc/ecj.jar
|
||||
|
|
@ -759,7 +761,7 @@ ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
|
|||
export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH
|
||||
ant -buildfile jdtcoresrc/compilejdtcore.xml
|
||||
|
||||
%if %{native_ecj}
|
||||
%if %{gcj_support}
|
||||
# Natively-compile it
|
||||
gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
|
||||
-o ecj.jar.so ecj.jar
|
||||
|
|
@ -1108,7 +1110,7 @@ ln -s %{_datadir}/java/eclipse-ecj.jar \
|
|||
|
||||
# FIXME: due to aot-compile-rpm smarts, the required resource bundles aren't
|
||||
# being compiled so this truly native ecj binary isn't possible
|
||||
#%if %{native_ecj}
|
||||
#%if %{gcj_support}
|
||||
# # Build and install ecj binary
|
||||
# pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
|
||||
# gcj -g -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
|
||||
|
|
@ -1128,12 +1130,7 @@ rm *.log
|
|||
popd
|
||||
|
||||
%if %{gcj_support}
|
||||
%ifarch ia64
|
||||
# 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.M20060628.jar --exclude %{_datadir}/%{name}/plugins/org.eclipse.ant.ui_3.2.0.v20060531.jar
|
||||
%else
|
||||
aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ant.ui_3.2.0.v20060531.jar
|
||||
%endif
|
||||
aot-compile-rpm
|
||||
%endif
|
||||
|
||||
%clean
|
||||
|
|
@ -1516,7 +1513,7 @@ fi
|
|||
%{_libdir}/gcj/%{name}/startup.jar*
|
||||
%{_libdir}/gcj/%{name}/com.jcraft.jsch_*
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.ant.core_*
|
||||
#%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_*
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_*
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.core.commands_*
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.core.expressions_*
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.core.contenttype_*
|
||||
|
|
@ -1571,10 +1568,7 @@ fi
|
|||
%{_libdir}/gcj/%{name}/platform.jar*
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.team.core_*
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh2_*
|
||||
# FIXME: work around aot-compile-rpm problem
|
||||
%ifnarch ia64
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.core_*
|
||||
%endif
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh_*
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_*
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.team.ui_*
|
||||
|
|
@ -1599,6 +1593,15 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Sep 06 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-4
|
||||
- Re-add customBuildCallbacks.xml-add-pre.gather.bin.parts.patch because
|
||||
it has not been applied upstream.
|
||||
- Minor spec file clean ups.
|
||||
- Add %{name} to the -devel package Provides so that upgrading from
|
||||
FC-5 to FC-6 works.
|
||||
- Re-enable natively compiling the ant.ui plugin.
|
||||
- Re-enable natively compiling the team.cvs.core plugin on ia64.
|
||||
|
||||
* Fri Sep 01 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-3
|
||||
- Use the system tomcat on ppc64 and s390x.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue