From 21e448a0a5bd30c6fa683c7eb1416996861d0a6e Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtakov@fedoraproject.org>
Date: Sep 29 2009 13:01:19 +0000
Subject: - Symlink to unversioned jetty jars.


---

diff --git a/eclipse.spec b/eclipse.spec
index 2039479..594e4d0 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -30,7 +30,7 @@ Epoch:  1
 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/
@@ -110,7 +110,7 @@ BuildRequires: jakarta-commons-logging >= 1.0.4-6jpp.3
 BuildRequires: jakarta-commons-codec
 BuildRequires: jakarta-commons-httpclient
 BuildRequires: mx4j >= 2.1
-BuildRequires: jetty >= 6.1.20
+BuildRequires: jetty >= 6.1.21-2
 BuildRequires: lucene >= 2.3.1-3.4
 BuildRequires: lucene-contrib >= 2.3.1-3.4
 BuildRequires: regexp
@@ -170,7 +170,7 @@ Requires: jakarta-commons-codec
 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 >= 6.1.20
+Requires: jetty >= 6.1.21-2
 Requires: jsch >= 0.1.41
 Requires: lucene >= 2.3.1-3.4
 Requires: lucene-contrib >= 2.3.1-3.4
@@ -395,11 +395,11 @@ ln -s %{_javadir}/ant/ant-trax.jar $ANTDIR/ant-trax.jar
 
 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
+ln -s %{_javadir}/jetty/jetty.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
+ln -s %{_javadir}/jetty/jetty-util.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
@@ -959,11 +959,11 @@ ln -s %{_javadir}/ant/ant-trax.jar $ANTDIR/ant-trax.jar
 
 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
+ln -s %{_javadir}/jetty/jetty.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
+ln -s %{_javadir}/jetty/jetty-util.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
 
 pushd dropins/jdt
 build-jar-repository -s -p plugins/org.junit_* junit
@@ -1295,6 +1295,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Sep 29 2009 Alexander Kurtakov <akurtako@redhat.com> 1:%{eclipse_majmin}.%{eclipse_micro}-4
+- Symlink to unversioned jetty jars.
+
 * Tue Sep 29 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.5.0-3
 - Build with eclipse-build 0.4.0 RC0.