rpms/eclipse/devel eclipse.spec,1.125,1.126

[fedora-cvs-commits at redhat.com]

Author: bkonrath

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

Modified Files:
	eclipse.spec 
Log Message:
- Add jsch >= 0.1.18-1jpp.
- Remove Fedora specific part of junit version.
- Temporarily disable org.eclipse.ui.forms_3.1.0.jar.so (rh#146463).



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- eclipse.spec	10 May 2005 16:41:43 -0000	1.125
+++ eclipse.spec	13 May 2005 15:45:44 -0000	1.126
@@ -23,7 +23,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:        0.M6.16
+Release:        0.M6.17
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -113,11 +113,11 @@
 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 lucene 
 BuildRequires: ant-jdepend ant-jmf ant-junit ant-nodeps ant-swing ant-trax ant-jsch
-BuildRequires: jsch
+BuildRequires: jsch >= 0.1.18-1jpp
 BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-logging jakarta-commons-modeler mx4j
 #BuildRequires: servlet lucene-demo jasper4 tomcat4
 BuildRequires: regexp 
-BuildRequires: junit >= 3.8.1-3jpp_4fc
+BuildRequires: junit >= 3.8.1-3jpp
 %if %{gcj_support}
 Requires(post,postun): java-1.4.2-gcj-compat
 %endif
@@ -166,7 +166,7 @@
 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 lucene 
 Requires: ant-jdepend ant-jmf ant-junit ant-nodeps ant-swing ant-trax ant-jsch
-Requires: jsch
+Requires: jsch >= 0.1.18-1jpp
 Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-logging jakarta-commons-modeler mx4j
 #Requires: servlet lucene-demo jasper4 tomcat4
 Requires: regexp
@@ -188,7 +188,7 @@
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       %{name}-ecj = %{epoch}:%{version}-%{release}
-Requires:	junit >= 3.8.1-3jpp_4fc
+Requires:	junit >= 3.8.1-3jpp
 %if %{gcj_support}
 Requires:	libgcj >= 4.0.0-2
 Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
@@ -527,10 +527,14 @@
     done
   %endif
   
-  # FIXME:  temporarily remove org.eclipse.ui.workbench_3.1.0.jar.so
+  # FIXME:  temporarily disable org.eclipse.ui.workbench_3.1.0.jar.so
   # see:  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151919
   mv \
     .%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_%{eclipse_majmin}.%{eclipse_micro}.jar.so{,.bak}
+  # FIXME:  temporarily disable org.eclipse.ui.forms_3.1.0.jar.so 
+  # see:  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146463
+  mv \
+    .%{_libdir}/%{name}/plugins/org.eclipse.ui.forms_%{eclipse_majmin}.%{eclipse_micro}.jar.so{,.bak}
   
   pushd .%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0
     gcj -g -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
@@ -545,6 +549,7 @@
   
   # Remove expanded eclipse build
   rm -rf eclipse
+
   popd
 %endif
 
@@ -1037,6 +1042,11 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
+* Wed May 11 2005 Ben Konrath <bkonrath at redhat.com> 3.1.0_fc-0.M6.17
+- Add jsch >= 0.1.18-1jpp.
+- Remove Fedora specific part of junit version.
+- Temporarily disable org.eclipse.ui.forms_3.1.0.jar.so (rh#146463).
+
 * Mon May 09 2005 Ben Konrath <bkonrath at redhat.com> 3.1.0_fc-0.M6.16
 - Add Requires junit >= 3.8.1-3jpp_4fc to JDT.
 - Add -g to gcj calls.