rpms/eclipse/devel eclipse.spec,1.99,1.100

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27434

Modified Files:
	eclipse.spec 
Log Message:
- Symlink out to ant-jsch now that we have that.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- eclipse.spec	6 Apr 2005 21:47:54 -0000	1.99
+++ eclipse.spec	8 Apr 2005 20:19:12 -0000	1.100
@@ -102,8 +102,8 @@
 BuildRequires:	java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_14rh
 
 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 ant-jsch lucene 
-BuildRequires: ant-jdepend ant-jmf ant-junit ant-nodeps ant-swing ant-trax
+#BuildRequires: ant-apache-bsf ant-commons-net lucene 
+BuildRequires: ant-jdepend ant-jmf ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 BuildRequires: jsch
 BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-logging jakarta-commons-modeler mx4j
 #BuildRequires: servlet lucene-demo jasper4 tomcat4
@@ -141,8 +141,8 @@
 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 ant-jsch lucene 
-Requires: ant-jdepend ant-jmf ant-junit ant-nodeps ant-swing ant-trax
+#Requires: ant-apache-bsf ant-commons-net lucene 
+Requires: ant-jdepend ant-jmf ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 Requires: jsch
 Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-logging jakarta-commons-modeler mx4j
 #Requires: servlet lucene-demo jasper4 tomcat4
@@ -272,7 +272,7 @@
 # ------------------------------------------------------------------------
 ln -sf %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant/lib/ant-jdepend.jar
 ln -sf %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant/lib/ant-jmf.jar
-#ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant/lib/ant-jsch.jar
+ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant/lib/ant-jsch.jar
 ln -sf %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant/lib/ant-junit.jar
 ln -sf %{_javadir}/ant-launcher.jar plugins/org.apache.ant/lib/ant-launcher.jar
 # ------------------------------------------------------------------------
@@ -445,6 +445,7 @@
 rm -f plugins/org.apache.ant_1.6.2/lib/ant-commons-logging.jar
 rm -f plugins/org.apache.ant_1.6.2/lib/ant-jdepend.jar
 rm -f plugins/org.apache.ant_1.6.2/lib/ant-jmf.jar
+rm -f plugins/org.apache.ant_1.6.2/lib/ant-jsch.jar
 rm -f plugins/org.apache.ant_1.6.2/lib/ant-junit.jar
 rm -f plugins/org.apache.ant_1.6.2/lib/ant-launcher.jar
 rm -f plugins/org.apache.ant_1.6.2/lib/ant-nodeps.jar
@@ -625,7 +626,7 @@
 #ln -sf %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_*/lib/ant-javamail.jar
 ln -sf %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_*/lib/ant-jdepend.jar
 ln -sf %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant_*/lib/ant-jmf.jar
-#ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_*/lib/ant-jsch.jar
+ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_*/lib/ant-jsch.jar
 ln -sf %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant_*/lib/ant-junit.jar
 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
@@ -980,7 +981,6 @@
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-xalan1.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-jai.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-starteam.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-jsch.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.0.0/webapp.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.0.0/WEB-INF/lib/jsp.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.0.0/WEB-INF/lib/servlets.jar.so
@@ -997,6 +997,7 @@
 - Add -O1 to x86_64 jar.so compilation.
 - Add EFJ (Eclipse Formatter for Java) patches (bkonrath) (e.o#75333).
 - Add patch to build swttools.jar (e.o#90364).
+- Symlink out to ant-jsch now that we have that.
 
 * Mon Apr 04 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-0.M5.17
 - Actually insert .jar-.jar.so combinations into sub-dbs.