rpms/eclipse
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Don't require tomcat on ppc64, s390, or s390x until we've got it there.

Browse Source
This commit is contained in:
Andrew Overholt 2006-07-05 12:40:06 +00:00
parent 1fca076c6e
commit 67315b4a68
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eclipse.spec
View File

@ -572,6 +572,7 @@ unzip -qq -o -d com.jcraft.jsch_0.1.28.jar-build com.jcraft.jsch_*.jar -x com\*
rm com.jcraft.jsch_*.jar
popd
%ifnarch ppc64 s390 s390x
## BEGIN TOMCAT ##
rm plugins/org.eclipse.tomcat/commons-beanutils.jar
rm plugins/org.eclipse.tomcat/commons-collections.jar
@ -628,6 +629,7 @@ build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jspapi
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib regexp
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib servletapi5
## END TOMCAT ##
%endif
build-jar-repository -s -p plugins/org.junit junit
pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
@ -1055,6 +1057,8 @@ ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene_*/lucene-1.4.3.jar
# FIXME
#rm plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
#ln -s %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
%ifnarch ppc64 s390 s390x
## BEGIN TOMCAT ##
rm plugins/org.eclipse.tomcat_*/commons-beanutils.jar
rm plugins/org.eclipse.tomcat_*/commons-collections.jar
@ -1099,6 +1103,7 @@ build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jspapi
build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib regexp
build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib servletapi5
## END TOMCAT ##
%endif
build-jar-repository -s -p plugins/org.junit_* junit
# Symlink org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar in
@ -1624,6 +1629,9 @@ fi
%endif
%changelog
* Wed Jul 05 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-1jpp_1fc
- Don't require tomcat on ppc64, s390, or s390x until we've got it there.
* Tue Jul 04 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-1jpp_1fc
- Fix tomcat symlinks.