- Revert ecj_bootstrap patch since it won't work.
- Keep mozilla requirement off ppc64. - Add ant-apache-bsf requirement since we have that in FC5.
This commit is contained in:
Andrew Overholt
parent
f244842fae
commit
703265f125
69
eclipse.spec
69
eclipse.spec
|
|
@ -1,11 +1,5 @@
|
|||
Epoch: 1
|
||||
|
||||
%ifarch %{ix86} x86_64 ppc
|
||||
%define ecj_bootstrap 0
|
||||
%else
|
||||
%define ecj_bootstrap 1
|
||||
%endif
|
||||
|
||||
%define gcj_support 1
|
||||
%define tomcatsharedir %{_datadir}/tomcat5
|
||||
%define tomcatlibdir %{_var}/lib/tomcat5
|
||||
|
|
@ -30,7 +24,7 @@ Epoch: 1
|
|||
Summary: %{pkg_summary}
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}_fc
|
||||
Release: 4
|
||||
Release: 5
|
||||
License: EPL
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
|
|
@ -104,9 +98,7 @@ Patch34: %{name}-bz162177.patch
|
|||
Patch35: %{name}-javadoc.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
%if !%{ecj_bootstrap}
|
||||
BuildRequires: ant
|
||||
%endif
|
||||
BuildRequires: perl
|
||||
BuildRequires: jpackage-utils >= 0:1.5, make, gcc
|
||||
BuildRequires: gnome-vfs2-devel
|
||||
|
|
@ -117,21 +109,18 @@ BuildRequires: gcc-c++
|
|||
BuildRequires: mozilla >= 37:1.7.8
|
||||
BuildRequires: mozilla-devel >= 37:1.7.8
|
||||
BuildRequires: mozilla-nspr-devel >= 37:1.7.8
|
||||
%endif
|
||||
BuildRequires: xorg-x11-devel
|
||||
%endif
|
||||
%if %{gcj_support}
|
||||
BuildRequires: gcc-java >= 4.0.0-9
|
||||
%if !%{ecj_bootstrap}
|
||||
BuildRequires: java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_24rh
|
||||
%endif
|
||||
BuildRequires: dos2unix
|
||||
%else
|
||||
BuildRequires: java-devel >= 1.4.2
|
||||
%endif
|
||||
|
||||
%if !%{ecj_bootstrap}
|
||||
BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
|
||||
#BuildRequires: ant-apache-bsf ant-commons-net
|
||||
BuildRequires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
|
||||
#BuildRequires: ant-commons-net
|
||||
BuildRequires: ant-javamail ant-jdepend ant-jmf ant-junit ant-nodeps ant-swing ant-trax ant-jsch
|
||||
BuildRequires: jsch >= 0:0.1.18-1jpp
|
||||
BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
|
||||
|
|
@ -140,7 +129,6 @@ BuildRequires: tomcat5 tomcat5-jasper tomcat5-servlet-2.4-api
|
|||
BuildRequires: lucene lucene-demo
|
||||
BuildRequires: regexp
|
||||
BuildRequires: junit >= 3.8.1-3jpp
|
||||
%endif
|
||||
%if %{gcj_support}
|
||||
Requires(post,postun): java-1.4.2-gcj-compat
|
||||
%endif
|
||||
|
|
@ -166,7 +154,6 @@ Requires: java >= 1.4.2
|
|||
%description ecj
|
||||
Eclipse compiler for Java.
|
||||
|
||||
%if !%{ecj_bootstrap}
|
||||
%package platform
|
||||
Summary: Eclipse platform common files
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
|
|
@ -190,8 +177,8 @@ Requires: /usr/bin/mozilla
|
|||
|
||||
PreReq: gtk2 >= 2.6
|
||||
|
||||
Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
|
||||
#Requires: ant-apache-bsf ant-commons-net
|
||||
Requires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
|
||||
#Requires: ant-commons-net
|
||||
Requires: ant-javamail ant-jdepend ant-jmf ant-junit ant-nodeps ant-swing ant-trax ant-jsch
|
||||
Requires: jsch >= 0:0.1.18-1jpp
|
||||
Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
|
||||
|
|
@ -290,7 +277,6 @@ Requires: %{name}-jdt-devel = %{epoch}:%{version}-%{release}
|
|||
|
||||
%description rcp-devel
|
||||
Source for RCP for use within Eclipse.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -c
|
||||
|
|
@ -383,7 +369,7 @@ find -name \*.so -exec rm "-f" "{}" ";"
|
|||
## BEGIN ANT ##
|
||||
ln -sf %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant/lib/ant-antlr.jar
|
||||
ln -sf %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant/lib/ant-apache-bcel.jar
|
||||
#ln -sf %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant/lib/ant-apache-bsf.jar
|
||||
ln -sf %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant/lib/ant-apache-bsf.jar
|
||||
ln -sf %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant/lib/ant-apache-log4j.jar
|
||||
ln -sf %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant/lib/ant-apache-oro.jar
|
||||
ln -sf %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant/lib/ant-apache-regexp.jar
|
||||
|
|
@ -401,8 +387,7 @@ ln -sf %{_javadir}/ant-launcher.jar plugins/org.apache.ant/lib/ant-launcher.jar
|
|||
ln -sf %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant/lib/ant-nodeps.jar
|
||||
ln -sf %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant/lib/ant-swing.jar
|
||||
ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant/lib/ant-trax.jar
|
||||
# We don't have these in FC4
|
||||
rm -f plugins/org.apache.ant/lib/ant-apache-bsf.jar
|
||||
# We don't have this in FC5
|
||||
rm -f plugins/org.apache.ant/lib/ant-commons-net.jar
|
||||
# We used to ship these pre-built, but we're not going to do that anymore. If
|
||||
# we can build them using free stuff, we will. -- overholt, 2005-07-04
|
||||
|
|
@ -514,14 +499,6 @@ ORIGCLASSPATH=$CLASSPATH
|
|||
export CLASSPATH=ecj-bootstrap.jar:$ORIGCLASSPATH
|
||||
#export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db"
|
||||
%endif
|
||||
%if %{ecj_bootstrap}
|
||||
gcj -O1 -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
|
||||
-o ecj-bootstrap.jar.so ecj-bootstrap.jar
|
||||
gcj -g --main=org.eclipse.jdt.internal.compiler.batch.Main \
|
||||
-Wl,-R,%{_libdir}/%{name} ecj-bootstrap.jar.so -o ecj
|
||||
%endif
|
||||
|
||||
%if !%{ecj_bootstrap}
|
||||
ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
|
||||
|
||||
%if %{gcj_support}
|
||||
|
|
@ -658,21 +635,10 @@ ant \
|
|||
#find $src_root -type d -a \( -name org.eclipse.swt -prune -o -name org -print0 \) | xargs -l -0 ./copyallsrc
|
||||
#./copyallsrc $src_root/org.eclipse.swt/Eclipse\ SWT/gtk/org
|
||||
#popd
|
||||
%endif
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%if %{ecj_bootstrap}
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
|
||||
install -m 644 ecj-bootstrap.jar $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj.jar
|
||||
install -m 644 ecj-bootstrap.jar.so $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse-ecj.jar.so
|
||||
install -m 644 ecj $RPM_BUILD_ROOT%{_bindir}
|
||||
|
||||
%else
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||
|
||||
tar -C $RPM_BUILD_ROOT%{_datadir} -zxf \
|
||||
|
|
@ -856,7 +822,7 @@ pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
|
|||
## BEGIN ANT ##
|
||||
ln -sf %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant_*/lib/ant-antlr.jar
|
||||
ln -sf %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant_*/lib/ant-apache-bcel.jar
|
||||
#ln -sf %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant_*/lib/ant-apache-bsf.jar
|
||||
ln -sf %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant_*/lib/ant-apache-bsf.jar
|
||||
ln -sf %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant_*/lib/ant-apache-log4j.jar
|
||||
ln -sf %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant_*/lib/ant-apache-oro.jar
|
||||
ln -sf %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant_*/lib/ant-apache-regexp.jar
|
||||
|
|
@ -874,8 +840,7 @@ ln -sf %{_javadir}/ant-launcher.jar plugins/org.apache.ant_*/lib/ant-launcher.ja
|
|||
ln -sf %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant_*/lib/ant-nodeps.jar
|
||||
ln -sf %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant_*/lib/ant-swing.jar
|
||||
ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_*/lib/ant-trax.jar
|
||||
# We don't have these in FC4
|
||||
rm -f plugins/org.apache.ant_*/lib/ant-apache-bsf.jar
|
||||
# We don't have this in FC5
|
||||
rm -f plugins/org.apache.ant_*/lib/ant-commons-net.jar
|
||||
# We used to ship these pre-built, but we're not going to do that anymore. If
|
||||
# we can build them using free stuff, we will. -- overholt, 2005-07-04
|
||||
|
|
@ -1016,18 +981,10 @@ for dir in `cat %{SOURCE10}`; do
|
|||
done;
|
||||
done
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%if %{ecj_bootstrap}
|
||||
%files ecj
|
||||
%{_datadir}/java/eclipse-ecj.jar
|
||||
%{_libdir}/%{name}/eclipse-ecj.jar.so
|
||||
%{_bindir}/ecj
|
||||
|
||||
%else
|
||||
%if %{gcj_support}
|
||||
%post ecj
|
||||
%{_bindir}/rebuild-gcj-db %{_libdir}
|
||||
|
|
@ -1265,9 +1222,13 @@ fi
|
|||
%{_datadir}/%{name}/plugins/org.eclipse.platform.source_3.*
|
||||
%{_datadir}/%{name}/features/org.eclipse.platform.source_3.*
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jul 05 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-5
|
||||
- Revert ecj_bootstrap patch since it won't work.
|
||||
- Keep mozilla requirement off ppc64.
|
||||
- Add ant-apache-bsf requirement since we have that in FC5.
|
||||
|
||||
* Tue Jul 05 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-4
|
||||
- Add ecj_bootstrap patch from Gary Benson to bootstrap new architectures.
|
||||
- Remove ExclusiveArch.
|
||||
|
|
|
|||
Loading…
Reference in New Issue