diff --git a/eclipse.spec b/eclipse.spec index daf06c7..e4d360a 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -102,8 +102,8 @@ BuildRequires: gcc-java >= 4.0.0-0.35 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 @@ Requires: /usr/bin/mozilla 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-commons-logging.jar plugins/org.apache.ant/lib/ant-co # ------------------------------------------------------------------------ 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-apache-resolver.jar 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.jar plugins/org.apache.ant_*/lib/ant.jar #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 @@ rebuild-gcj-db %{_libdir} %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 @@ rebuild-gcj-db %{_libdir} - 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 3.1.0_fc-0.M5.17 - Actually insert .jar-.jar.so combinations into sub-dbs.