- Rebuild to pick up new xulrunner.
This commit is contained in:
parent
7cafa927af
commit
27a26e441b
131
eclipse.spec
131
eclipse.spec
|
@ -27,7 +27,7 @@ Epoch: 1
|
||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
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/
|
||||||
|
@ -86,7 +86,7 @@ BuildRequires: lucene-contrib >= 2.3.1-3.4
|
||||||
BuildRequires: junit >= 3.8.1-3jpp
|
BuildRequires: junit >= 3.8.1-3jpp
|
||||||
BuildRequires: junit4
|
BuildRequires: junit4
|
||||||
BuildRequires: hamcrest >= 0:1.1-9.2
|
BuildRequires: hamcrest >= 0:1.1-9.2
|
||||||
BuildRequires: sat4j >= 2.1.0-1
|
BuildRequires: sat4j >= 2.1.1-1
|
||||||
BuildRequires: objectweb-asm
|
BuildRequires: objectweb-asm
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
@ -340,6 +340,7 @@ for plugin in org.eclipse.jdt \
|
||||||
org.eclipse.jdt.launching \
|
org.eclipse.jdt.launching \
|
||||||
org.eclipse.jdt.ui \
|
org.eclipse.jdt.ui \
|
||||||
org.eclipse.jdt.doc.user \
|
org.eclipse.jdt.doc.user \
|
||||||
|
org.hamcrest.core \
|
||||||
org.junit \
|
org.junit \
|
||||||
org.junit4 ; do
|
org.junit4 ; do
|
||||||
mv $sdkDir/plugins/${plugin}_* plugins
|
mv $sdkDir/plugins/${plugin}_* plugins
|
||||||
|
@ -580,6 +581,128 @@ popd
|
||||||
ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
|
ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
|
||||||
rm plugins/com.ibm.icu_*.jar
|
rm plugins/com.ibm.icu_*.jar
|
||||||
|
|
||||||
|
SAT4JVERSION=$(ls plugins | grep org.sat4j.core_ | \
|
||||||
|
sed 's/org.sat4j.core_//')
|
||||||
|
rm plugins/org.sat4j*
|
||||||
|
ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_$SAT4JVERSION
|
||||||
|
ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_$SAT4JVERSION
|
||||||
|
|
||||||
|
ASMPLUGINVERSION=$(ls dropins/sdk/plugins | grep org.objectweb.asm_ | \
|
||||||
|
sed 's/org.objectweb.asm_//')
|
||||||
|
rm dropins/sdk/plugins/org.objectweb.asm_$ASMPLUGINVERSION
|
||||||
|
ln -s %{_javadir}/objectweb-asm/asm-all.jar \
|
||||||
|
dropins/sdk/plugins/org.objectweb.asm_$ASMPLUGINVERSION
|
||||||
|
|
||||||
|
# Duplicate junit4
|
||||||
|
rm -rf dropins/sdk/plugins/org.junit4
|
||||||
|
|
||||||
|
# link to hamcrest-core
|
||||||
|
HAMCRESTCOREVERSION=$(ls dropins/jdt/plugins | grep org.hamcrest.core_ | \
|
||||||
|
sed 's/org.hamcrest.core_//')
|
||||||
|
rm dropins/jdt/plugins/org.hamcrest.core_$HAMCRESTCOREVERSION
|
||||||
|
ln -s %{_javadir}/hamcrest/core.jar \
|
||||||
|
dropins/jdt/plugins/org.hamcrest.core_$HAMCRESTCOREVERSION
|
||||||
|
|
||||||
|
JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
|
||||||
|
rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
|
||||||
|
ln -s %{_datadir}/jetty-eclipse/lib/jetty-6.1.21.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
|
||||||
|
|
||||||
|
JETTYUTILVERSION=$(ls plugins | grep org.mortbay.jetty.util_6 | sed 's/org.mortbay.jetty.util_//')
|
||||||
|
rm plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
|
||||||
|
ln -s %{_datadir}/jetty-eclipse/lib/jetty-util-6.1.21.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
|
||||||
|
|
||||||
|
JSCHVERSION=$(ls plugins | grep com.jcraft.jsch_ | sed 's/com.jcraft.jsch_//')
|
||||||
|
rm plugins/com.jcraft.jsch_$JSCHVERSION
|
||||||
|
ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION
|
||||||
|
|
||||||
|
# link to lucene
|
||||||
|
LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \
|
||||||
|
sed 's/org.apache.lucene_//')
|
||||||
|
rm plugins/org.apache.lucene_*
|
||||||
|
ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene_$LUCENEVERSION
|
||||||
|
rm plugins/org.apache.lucene.analysis_*
|
||||||
|
ln -s %{_javadir}/lucene-contrib/lucene-analyzers.jar \
|
||||||
|
plugins/org.apache.lucene.analysis_$LUCENEVERSION
|
||||||
|
|
||||||
|
# link to commons-logging
|
||||||
|
COMMONSLOGGINGVERSION=$(ls plugins | grep commons.logging_ | \
|
||||||
|
sed 's/org.apache.commons.logging_//')
|
||||||
|
rm plugins/org.apache.commons.logging_$COMMONSLOGGINGVERSION
|
||||||
|
ln -s %{_javadir}/commons-logging.jar \
|
||||||
|
plugins/org.apache.commons.logging_$COMMONSLOGGINGVERSION
|
||||||
|
|
||||||
|
# link to commons-el
|
||||||
|
COMMONSELVERSION=$(ls plugins | grep commons.el_ | \
|
||||||
|
sed 's/org.apache.commons.el_//')
|
||||||
|
rm plugins/org.apache.commons.el_$COMMONSELVERSION
|
||||||
|
ln -s %{_javadir}/commons-el.jar \
|
||||||
|
plugins/org.apache.commons.el_$COMMONSELVERSION
|
||||||
|
|
||||||
|
# link to commons-codec
|
||||||
|
COMMONSCODECVERSION=$(ls plugins | grep commons.codec_ | \
|
||||||
|
sed 's/org.apache.commons.codec_//')
|
||||||
|
rm plugins/org.apache.commons.codec_$COMMONSCODECVERSION
|
||||||
|
ln -s %{_javadir}/commons-codec.jar \
|
||||||
|
plugins/org.apache.commons.codec_$COMMONSCODECVERSION
|
||||||
|
|
||||||
|
# link to commons-httpclient
|
||||||
|
COMMONSHTTPVERSION=$(ls plugins | grep commons.httpclient_ | \
|
||||||
|
sed 's/org.apache.commons.httpclient_//')
|
||||||
|
rm plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION
|
||||||
|
ln -s %{_javadir}/commons-httpclient.jar \
|
||||||
|
plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION
|
||||||
|
|
||||||
|
# link to jasper
|
||||||
|
JASPERVERSION=$(ls plugins | grep org.apache.jasper_ | \
|
||||||
|
sed 's/org.apache.jasper_//')
|
||||||
|
rm plugins/org.apache.jasper_*.jar
|
||||||
|
ln -s %{_javadir}/apache-jasper-5.5.28.jar \
|
||||||
|
plugins/org.apache.jasper_$JASPERVERSION
|
||||||
|
|
||||||
|
# link to servlet-api
|
||||||
|
SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_ | \
|
||||||
|
sed 's/javax.servlet_//')
|
||||||
|
rm plugins/javax.servlet_*
|
||||||
|
ln -s %{_javadir}/apache-tomcat-apis/tomcat-servlet2.5-api.jar \
|
||||||
|
plugins/javax.servlet_$SERVLETAPIVERSION
|
||||||
|
|
||||||
|
# link to jsp-api
|
||||||
|
JSPAPIVERSION=$(ls plugins | grep javax.servlet.jsp_ | \
|
||||||
|
sed 's/javax.servlet.jsp_//')
|
||||||
|
rm plugins/javax.servlet.jsp_*
|
||||||
|
ln -s %{_javadir}/apache-tomcat-apis/tomcat-jsp2.0-api.jar \
|
||||||
|
plugins/javax.servlet.jsp_$JSPAPIVERSION
|
||||||
|
|
||||||
|
## BEGIN ANT ##
|
||||||
|
ANTDIR=plugins/$(ls plugins | grep org.apache.ant_)
|
||||||
|
rm $ANTDIR/lib/*
|
||||||
|
ANTDIR=$ANTDIR/lib
|
||||||
|
ln -s %{_javadir}/ant/ant-antlr.jar $ANTDIR/ant-antlr.jar
|
||||||
|
ln -s %{_javadir}/ant/ant-apache-bcel.jar $ANTDIR/ant-apache-bcel.jar
|
||||||
|
ln -s %{_javadir}/ant/ant-apache-bsf.jar $ANTDIR/ant-apache-bsf.jar
|
||||||
|
ln -s %{_javadir}/ant/ant-apache-log4j.jar $ANTDIR/ant-apache-log4j.jar
|
||||||
|
ln -s %{_javadir}/ant/ant-apache-oro.jar $ANTDIR/ant-apache-oro.jar
|
||||||
|
ln -s %{_javadir}/ant/ant-apache-regexp.jar $ANTDIR/ant-apache-regexp.jar
|
||||||
|
ln -s %{_javadir}/ant/ant-apache-resolver.jar $ANTDIR/ant-apache-resolver.jar
|
||||||
|
ln -s %{_javadir}/ant/ant-commons-logging.jar $ANTDIR/ant-commons-logging.jar
|
||||||
|
ln -s %{_javadir}/ant/ant-commons-net.jar $ANTDIR/ant-commons-net.jar
|
||||||
|
#ln -s %{_javadir}/ant/ant-jai.jar $ANTDIR/ant-jai.jar
|
||||||
|
ln -s %{_javadir}/ant.jar $ANTDIR/ant.jar
|
||||||
|
ln -s %{_javadir}/ant/ant-javamail.jar $ANTDIR/ant-javamail.jar
|
||||||
|
ln -s %{_javadir}/ant/ant-jdepend.jar $ANTDIR/ant-jdepend.jar
|
||||||
|
#ln -s %{_javadir}/ant/ant-jmf.jar $ANTDIR/ant-jmf.jar
|
||||||
|
ln -s %{_javadir}/ant/ant-jsch.jar $ANTDIR/ant-jsch.jar
|
||||||
|
ln -s %{_javadir}/ant/ant-junit.jar $ANTDIR/ant-junit.jar
|
||||||
|
ln -s %{_javadir}/ant-launcher.jar $ANTDIR/ant-launcher.jar
|
||||||
|
#ln -s %{_javadir}/ant/ant-netrexx.jar $ANTDIR/ant-netrexx.jar
|
||||||
|
ln -s %{_javadir}/ant/ant-nodeps.jar $ANTDIR/ant-nodeps.jar
|
||||||
|
#ln -s %{_javadir}/ant/ant-starteam.jar $ANTDIR/ant-starteam.jar
|
||||||
|
#ln -s %{_javadir}/ant/ant-stylebook.jar $ANTDIR/ant-stylebook.jar
|
||||||
|
ln -s %{_javadir}/ant/ant-swing.jar $ANTDIR/ant-swing.jar
|
||||||
|
ln -s %{_javadir}/ant/ant-trax.jar $ANTDIR/ant-trax.jar
|
||||||
|
#ln -s %{_javadir}/ant/ant-weblogic.jar $ANTDIR/ant-weblogic.jar
|
||||||
|
## END ANT ##
|
||||||
|
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
@ -845,6 +968,10 @@ fi
|
||||||
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
|
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 10 2010 Andrew Overholt <overholt@redhat.com> 1:3.5.2-5
|
||||||
|
- Move hamcrest to dropins/jdt (rhbz#601059).
|
||||||
|
- Re-symlink after provisioning (rhbz#602865).
|
||||||
|
|
||||||
* Mon Apr 12 2010 Andrew Overholt <overholt@redhat.com> 1:3.5.2-4
|
* Mon Apr 12 2010 Andrew Overholt <overholt@redhat.com> 1:3.5.2-4
|
||||||
- Rebuild to pick up new xulrunner.
|
- Rebuild to pick up new xulrunner.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue