rpms/eclipse/devel eclipse.spec,1.468,1.469

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2253

Modified Files:
	eclipse.spec 
Log Message:
* Tue Aug 28 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-11
- Symlink to jetty.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -r1.468 -r1.469
--- eclipse.spec	28 Aug 2007 22:43:52 -0000	1.468
+++ eclipse.spec	29 Aug 2007 13:46:48 -0000	1.469
@@ -19,7 +19,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        10%{?dist} 
+Release:        11%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -106,6 +106,7 @@
 BuildRequires: tomcat5 >= 5.5.23
 BuildRequires: tomcat5-jasper >= 5.5.23
 BuildRequires: tomcat5-servlet-2.4-api >= 5.5.23
+BuildRequires: jetty
 BuildRequires: lucene >= 1.9.1
 BuildRequires: lucene-contrib >= 1.9.1
 BuildRequires: regexp 
@@ -234,6 +235,7 @@
 Requires: tomcat5-jasper-eclipse >= 5.5.23
 Requires: tomcat5-servlet-2.4-api >= 5.5.23
 Requires: tomcat5-jsp-2.0-api >= 5.5.23
+Requires: jetty
 Requires: jsch >= 0.1.31
 Requires: lucene >= 1.9.1
 Requires: lucene-contrib >= 1.9.1
@@ -520,6 +522,10 @@
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib servletapi5
 ## END TOMCAT ##
 
+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
+
 JUNITVERSION=$(ls plugins | grep org.junit_3 | sed 's/org.junit_//')
 build-jar-repository -s -p plugins/org.junit_$JUNITVERSION junit
 
@@ -1042,6 +1048,10 @@
 build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib servletapi5
 ## END TOMCAT ##
 
+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
+
 build-jar-repository -s -p plugins/org.junit_* junit
 
 rm plugins/org.junit4_4.3.1/junit.jar
@@ -1483,7 +1493,6 @@
 %{_libdir}/gcj/%{name}/org.eclipse.update.core_*
 %{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_*
 %{_libdir}/gcj/%{name}/org.eclipse.update.ui_*
-%{_libdir}/gcj/%{name}/org.mortbay.jetty_*
 %{_libdir}/gcj/%{name}/compatibility.*
 %{_libdir}/gcj/%{name}/org.eclipse.equinox.http.registry_*
 %{_libdir}/gcj/%{name}/org.eclipse.equinox.initializer_*
@@ -1587,6 +1596,9 @@
 %endif
 
 %changelog
+* Tue Aug 28 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-11
+- Symlink to jetty.
+
 * Tue Aug 28 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-10
 - Add requires eclipse-cvs-client, eclipse-subclipse, eclipse-mylyn,
   eclipse-mylyn-ide, eclipse-mylyn-bugzilla, eclipse-mylyn-trac