- Use the system tomcat on ppc64 and s390x.
This commit is contained in:
Ben Konrath
parent
fad60dcf13
commit
19e4982f56
50
eclipse.spec
50
eclipse.spec
@ -40,7 +40,7 @@ Epoch: 1
|
||||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||
Release: 3
|
||||
Release: 3%{?dist}
|
||||
License: EPL
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
@ -106,7 +106,6 @@ Patch55: %{name}-disable-junit4-apt.patch
|
||||
Patch28: %{name}-tomcat55.patch
|
||||
Patch29: %{name}-tomcat55-build.patch
|
||||
Patch31: %{name}-webapp-tomcat55.patch
|
||||
Patch56: %{name}-webapp-tomcat55-newarches.patch
|
||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707
|
||||
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178726
|
||||
Patch33: %{name}-compare-create-api.patch
|
||||
@ -162,14 +161,11 @@ BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apa
|
||||
#BuildRequires: ant-commons-net
|
||||
BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
|
||||
BuildRequires: jsch >= 0:0.1.28-1jpp
|
||||
#FIXME
|
||||
%ifnarch ppc64 s390x
|
||||
BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
|
||||
BuildRequires: mx4j >= 2.1
|
||||
BuildRequires: tomcat5 >= 5.5.17
|
||||
BuildRequires: tomcat5-jasper >= 5.5.17
|
||||
BuildRequires: tomcat5-servlet-2.4-api >= 5.5.17
|
||||
%endif
|
||||
BuildRequires: lucene
|
||||
BuildRequires: regexp
|
||||
BuildRequires: junit >= 3.8.1-3jpp
|
||||
@ -229,14 +225,11 @@ Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-r
|
||||
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
|
||||
#Requires: ant-commons-net
|
||||
Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
|
||||
#FIXME
|
||||
%ifnarch ppc64 s390x
|
||||
Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
|
||||
Requires: mx4j >= 2.1
|
||||
Requires: tomcat5 >= 5.5.17
|
||||
Requires: tomcat5-jasper >= 5.5.17
|
||||
Requires: tomcat5-servlet-2.4-api >= 5.5.17
|
||||
%endif
|
||||
Requires: lucene
|
||||
Requires: regexp
|
||||
|
||||
@ -403,7 +396,6 @@ pushd plugins/org.eclipse.core.runtime
|
||||
%patch24 -p0
|
||||
popd
|
||||
|
||||
%ifnarch ppc64 s390x
|
||||
# tomcat patches
|
||||
pushd plugins/org.eclipse.tomcat
|
||||
%patch28 -p0
|
||||
@ -416,12 +408,6 @@ sed --in-place "s/4.1.130/5.5.17/" \
|
||||
pushd plugins/org.eclipse.help.webapp
|
||||
%patch31 -p0
|
||||
popd
|
||||
# FIXME: this is just until tomcat is built on these arches
|
||||
%else
|
||||
pushd plugins/org.eclipse.help.webapp
|
||||
%patch56 -p0
|
||||
popd
|
||||
%endif
|
||||
pushd plugins/org.eclipse.compare
|
||||
#%patch33 -p0
|
||||
popd
|
||||
@ -589,7 +575,6 @@ 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 s390x
|
||||
## BEGIN TOMCAT ##
|
||||
rm plugins/org.eclipse.tomcat/commons-beanutils.jar
|
||||
rm plugins/org.eclipse.tomcat/commons-collections.jar
|
||||
@ -646,7 +631,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
|
||||
@ -1075,7 +1060,6 @@ ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene_*/lucene-1.4.3.jar
|
||||
#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 s390x
|
||||
## BEGIN TOMCAT ##
|
||||
TOMCATPLUGINVERSION=$(ls | grep tomcat | sed 's/org.eclipse.tomcat_//')
|
||||
mkdir -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib
|
||||
@ -1111,7 +1095,7 @@ build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib j
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib regexp
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/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
|
||||
@ -1601,31 +1585,6 @@ fi
|
||||
%{_libdir}/gcj/%{name}/ant-apache-bsf.jar*
|
||||
%{_libdir}/gcj/%{name}/jsp.jar*
|
||||
%{_libdir}/gcj/%{name}/parser.jar*
|
||||
# FIXME: take this out when tomcat is built on these arches
|
||||
%ifarch ppc64 s390x
|
||||
%{_libdir}/gcj/%{name}/bootstrap.jar*
|
||||
%{_libdir}/gcj/%{name}/catalina.jar*
|
||||
%{_libdir}/gcj/%{name}/commons-beanutils.jar*
|
||||
%{_libdir}/gcj/%{name}/commons-collections.jar*
|
||||
%{_libdir}/gcj/%{name}/commons-digester.jar*
|
||||
%{_libdir}/gcj/%{name}/commons-logging-api.jar*
|
||||
%{_libdir}/gcj/%{name}/commons-modeler.jar*
|
||||
%{_libdir}/gcj/%{name}/jakarta-regexp-1.3.jar*
|
||||
%{_libdir}/gcj/%{name}/jasper-compiler.jar*
|
||||
%{_libdir}/gcj/%{name}/jasper-runtime.jar*
|
||||
%{_libdir}/gcj/%{name}/mx4j-jmx.jar*
|
||||
%{_libdir}/gcj/%{name}/naming-common.jar*
|
||||
%{_libdir}/gcj/%{name}/naming-factory.jar*
|
||||
%{_libdir}/gcj/%{name}/naming-resources.jar*
|
||||
%{_libdir}/gcj/%{name}/servlet.jar*
|
||||
%{_libdir}/gcj/%{name}/servlets-common.jar*
|
||||
%{_libdir}/gcj/%{name}/servlets-default.jar*
|
||||
%{_libdir}/gcj/%{name}/servlets-invoker.jar*
|
||||
%{_libdir}/gcj/%{name}/servlets-manager.jar*
|
||||
%{_libdir}/gcj/%{name}/tomcat-coyote.jar*
|
||||
%{_libdir}/gcj/%{name}/tomcat-http11.jar*
|
||||
%{_libdir}/gcj/%{name}/tomcat-util.jar*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%files platform-sdk
|
||||
@ -1640,6 +1599,9 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Sep 01 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-3
|
||||
- Use the system tomcat on ppc64 and s390x.
|
||||
|
||||
* Wed Aug 30 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-3
|
||||
- Don't use pkg_summary.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user