Re-add s390.
This commit is contained in:
parent
9c8f04f98a
commit
242f8fc3ca
14
eclipse.spec
14
eclipse.spec
|
@ -162,7 +162,7 @@ BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apa
|
||||||
BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
|
BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
|
||||||
BuildRequires: jsch >= 0:0.1.28-1jpp
|
BuildRequires: jsch >= 0:0.1.28-1jpp
|
||||||
#FIXME
|
#FIXME
|
||||||
%ifnarch ppc64 s390 s390x
|
%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: 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: mx4j >= 2.1
|
||||||
BuildRequires: tomcat5 >= 5.5.17
|
BuildRequires: tomcat5 >= 5.5.17
|
||||||
|
@ -229,7 +229,7 @@ Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-r
|
||||||
#Requires: ant-commons-net
|
#Requires: ant-commons-net
|
||||||
Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
|
Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
|
||||||
#FIXME
|
#FIXME
|
||||||
%ifnarch ppc64 s390 s390x
|
%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: 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: mx4j >= 2.1
|
||||||
Requires: tomcat5 >= 5.5.17
|
Requires: tomcat5 >= 5.5.17
|
||||||
|
@ -397,7 +397,7 @@ pushd plugins/org.eclipse.core.runtime
|
||||||
%patch24 -p0
|
%patch24 -p0
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%ifnarch ppc64 s390 s390x
|
%ifnarch ppc64 s390x
|
||||||
# tomcat patches
|
# tomcat patches
|
||||||
pushd plugins/org.eclipse.tomcat
|
pushd plugins/org.eclipse.tomcat
|
||||||
%patch28 -p0
|
%patch28 -p0
|
||||||
|
@ -580,7 +580,7 @@ unzip -qq -o -d com.jcraft.jsch_0.1.28.jar-build com.jcraft.jsch_*.jar -x com\*
|
||||||
rm com.jcraft.jsch_*.jar
|
rm com.jcraft.jsch_*.jar
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%ifnarch ppc64 s390 s390x
|
%ifnarch ppc64 s390x
|
||||||
## BEGIN TOMCAT ##
|
## BEGIN TOMCAT ##
|
||||||
rm plugins/org.eclipse.tomcat/commons-beanutils.jar
|
rm plugins/org.eclipse.tomcat/commons-beanutils.jar
|
||||||
rm plugins/org.eclipse.tomcat/commons-collections.jar
|
rm plugins/org.eclipse.tomcat/commons-collections.jar
|
||||||
|
@ -1066,7 +1066,7 @@ 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
|
#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
|
#ln -s %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
|
||||||
|
|
||||||
%ifnarch ppc64 s390 s390x
|
%ifnarch ppc64 s390x
|
||||||
## BEGIN TOMCAT ##
|
## BEGIN TOMCAT ##
|
||||||
TOMCATPLUGINVERSION=$(ls | grep tomcat | sed 's/org.eclipse.tomcat_//')
|
TOMCATPLUGINVERSION=$(ls | grep tomcat | sed 's/org.eclipse.tomcat_//')
|
||||||
mkdir -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib
|
mkdir -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib
|
||||||
|
@ -1593,7 +1593,7 @@ fi
|
||||||
%{_libdir}/gcj/%{name}/jsp.jar*
|
%{_libdir}/gcj/%{name}/jsp.jar*
|
||||||
%{_libdir}/gcj/%{name}/parser.jar*
|
%{_libdir}/gcj/%{name}/parser.jar*
|
||||||
# FIXME: take this out when tomcat is built on these arches
|
# FIXME: take this out when tomcat is built on these arches
|
||||||
%ifarch ppc64 s390 s390x
|
%ifarch ppc64 s390x
|
||||||
%{_libdir}/gcj/%{name}/bootstrap.jar*
|
%{_libdir}/gcj/%{name}/bootstrap.jar*
|
||||||
%{_libdir}/gcj/%{name}/catalina.jar*
|
%{_libdir}/gcj/%{name}/catalina.jar*
|
||||||
%{_libdir}/gcj/%{name}/commons-beanutils.jar*
|
%{_libdir}/gcj/%{name}/commons-beanutils.jar*
|
||||||
|
@ -1632,7 +1632,7 @@ fi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Jul 06 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-1jpp_1fc
|
* Thu Jul 06 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-1jpp_1fc
|
||||||
- Temporarily add webapp patch for ppc64, s390, and s390x.
|
- Temporarily add webapp patch for ppc64 and s390x.
|
||||||
- Bump tomcat5 to 5.5.17 both in BR/R and in patches.
|
- Bump tomcat5 to 5.5.17 both in BR/R and in patches.
|
||||||
|
|
||||||
* Wed Jul 05 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-1jpp_1fc
|
* Wed Jul 05 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-1jpp_1fc
|
||||||
|
|
Loading…
Reference in New Issue