Build with system jetty.

This commit is contained in:
Alexander Kurtakov 2009-09-15 16:19:48 +00:00
parent 5c8679bab4
commit 3dfaaaa8a3

View File

@ -30,7 +30,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 0.11%{?dist}
Release: 0.12%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -170,7 +170,7 @@ BuildRequires: jakarta-commons-logging >= 1.0.4-6jpp.3
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-httpclient
BuildRequires: mx4j >= 2.1
BuildRequires: jetty >= 5.1.14-1.6
BuildRequires: jetty >= 6.1.20
BuildRequires: lucene >= 2.3.1-3.4
BuildRequires: lucene-contrib >= 2.3.1-3.4
BuildRequires: regexp
@ -229,7 +229,7 @@ Requires: jakarta-commons-logging >= 1.0.4-6jpp.3
Requires: mx4j >= 2.1
Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3
Requires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
Requires: jetty >= 5.1.14-1.6
Requires: jetty >= 6.1.20
Requires: jsch >= 0.1.41
Requires: lucene >= 2.3.1-3.4
Requires: lucene-contrib >= 2.3.1-3.4
@ -512,10 +512,13 @@ ln -s %{_javadir}/ant/ant-trax.jar $ANTDIR/ant-trax.jar
#ln -s %{_javadir}/ant/ant-weblogic.jar $ANTDIR/ant-weblogic.jar
# END ANT ##
#JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty_5 | sed 's/org.mortbay.jetty_//')
# TODO fix jetty
#rm plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
#ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
ln -s %{_javadir}/jetty/jetty-6.1.20.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 %{_javadir}/jetty/jetty-util-6.1.20.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
JUNITVERSION=$(ls plugins | grep org.junit_3 | sed 's/org.junit_//')
build-jar-repository -s -p plugins/org.junit_$JUNITVERSION junit
@ -1086,9 +1089,13 @@ ln -s %{_javadir}/ant/ant-trax.jar $ANTDIR/ant-trax.jar
#ln -s %{_javadir}/ant/ant-weblogic.jar $ANTDIR/ant-weblogic.jar
## END ANT ##
#JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty_5 | sed 's/org.mortbay.jetty_//')
#rm plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
#ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
ln -s %{_javadir}/jetty/jetty-6.1.20.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 %{_javadir}/jetty/jetty-util-6.1.20.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
pushd dropins/jdt
build-jar-repository -s -p plugins/org.junit_* junit
@ -1420,6 +1427,9 @@ fi
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
* Tue Sep 15 2009 Alexander Kurtakov <akurtako@redhat.com> 1:%{eclipse_majmin}.%{eclipse_micro}-0.12
- Build with system jetty.
* Mon Sep 14 2009 Andrew Overholt <overholt@redhat.com> 1:3.5.0-0.11
- Add /usr/share/eclipse/dropins to list of dropins locations
(rhbz#522117).