- Add tomcat5 patch and symlinks.

This commit is contained in:
Andrew Overholt 2005-06-16 16:02:07 +00:00
parent 5a36041055
commit 8572c32f67
2 changed files with 128 additions and 96 deletions

View File

@ -1,7 +1,8 @@
Epoch: 1
ExclusiveArch: %{ix86} x86_64 ppc
%define gcj_support 1
%define tomcatsharedir %{_datadir}/tomcat5
%define tomcatlibdir %{_var}/lib/tomcat5
%define pkg_summary An open, extensible IDE
%define section free
%define swt_version 3135
@ -23,7 +24,7 @@ ExclusiveArch: %{ix86} x86_64 ppc
Summary: %{pkg_summary}
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}_fc
Release: 0.M7.8
Release: 0.M7.9
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -90,7 +91,17 @@ Patch25: %{name}-build.xml-typo.patch
Patch26: %{name}-ecj-options.patch
# work around for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21637
Patch27: %{name}-startup-url.openStream.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371
Patch28: %{name}-tomcat5.m7.patch
Patch29: %{name}-tomcat5-build.m7.patch
Patch30: %{name}-tomcat5-build.2.m7.patch
Patch31: %{name}-webapp-tomcat5.patch
%if %{gcj_support}
ExclusiveArch: %{ix86} x86_64 ppc
%else
BuildArch: noarch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: ant
BuildRequires: perl
@ -112,11 +123,13 @@ BuildRequires: java-devel >= 1.4.2
%endif
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-apache-bsf ant-commons-net
BuildRequires: ant-jdepend ant-jmf ant-junit ant-nodeps ant-swing ant-trax ant-jsch
BuildRequires: jsch >= 0: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: 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 tomcat5-jasper tomcat5-servlet-2.4-api
#BuildRequires: lucene lucene-demo
BuildRequires: regexp
BuildRequires: junit >= 3.8.1-3jpp
%if %{gcj_support}
@ -148,9 +161,10 @@ Eclipse compiler for Java.
Summary: Eclipse platform common files
Group: Text Editors/Integrated Development Environments (IDE)
Provides: %{name} = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-sdk %{name}-ui %{name}-gtk2 eclipse
Obsoletes: %{name}-sdk %{name}-ui %{name}-gtk2 %{name}-scripts eclipse
Provides: %{name}-sdk = %{epoch}:%{version}-%{release}
Provides: %{name}-ui = %{epoch}:%{version}-%{release}
Provides: %{name}-scripts = %{epoch}:%{version}-%{release}
Provides: %{name}-gtk2 = %{epoch}:%{version}-%{release}
%if %{gcj_support}
Requires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
@ -166,11 +180,13 @@ 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 lucene
#Requires: ant-apache-bsf ant-commons-net
Requires: ant-jdepend ant-jmf ant-junit ant-nodeps ant-swing ant-trax ant-jsch
Requires: jsch >= 0: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: 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 tomcat5-jasper tomcat5-servlet-2.4-api
#Requires: lucene lucene-demo
Requires: regexp
%description platform
@ -290,6 +306,14 @@ popd
pushd plugins/org.eclipse.platform
%patch27 -p0
popd
pushd plugins/org.eclipse.tomcat
%patch28 -p0
%patch29 -p0
popd
%patch30 -p0
pushd plugins/org.eclipse.help.webapp
%patch31 -p0
popd
%if %{gcj_support}
# Fedora splash screen.
@ -365,46 +389,53 @@ ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant/lib/ant-trax.jar
##ln -sf %{_javadir}/ant/ant-xslp.jar plugins/org.apache.ant/lib/ant-xslp.jar
# ------------------------------------------------------------------------
## END ANT ##
## BEGIN LUCENE ##
#ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene/lucene-1.4.3.jar
#ln -sf %{_datadir}/lucene/lucene-demos-1.4.3.jar plugins/org.apache.lucene/parser.jar
# plugins/org.eclipse.core.boot/boot.jar
# plugins/org.eclipse.osgi/osgi/collx.jar
# plugins/org.eclipse.osgi/osgi/ee.foundation.jar
# plugins/org.eclipse.osgi/osgi/ee.minimum.jar
# plugins/org.eclipse.osgi/osgi/exceptions.jar
# plugins/org.eclipse.osgi/osgi/osgi-r3-jdk131-notsigned.jar
#ln -sf %{_javadir}/xml-commons-apis.jar plugins/org.eclipse.osgi/osgi/xmlParserAPIs.jar
# plugins/org.eclipse.osgi.services/services.jar
# plugins/org.eclipse.osgi.util/util.jar
## END LUCENE ##
# =====>>>>>>>>>>>ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar
# plugins/org.eclipse.text/text.jar
# ------------------------------------------------------------------------
# FIXME: need tomcat4 rpm
## BEGIN TOMCAT4 ##
#ln -sf %{tomcat4dir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar
#ln -sf %{tomcat4dir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/catalina.jar
#ln -sf %{_javadir}/commons-beanutils.jar plugins/org.eclipse.tomcat/commons-beanutils.jar
#ln -sf %{_javadir}/commons-collections.jar plugins/org.eclipse.tomcat/commons-collections.jar
#ln -sf %{_javadir}/commons-digester.jar plugins/org.eclipse.tomcat/commons-digester.jar
#ln -sf %{_javadir}/commons-logging-api.jar plugins/org.eclipse.tomcat/commons-logging-api.jar
#ln -sf %{_javadir}/commons-logging.jar plugins/org.eclipse.tomcat/commons-logging.jar
#ln -sf %{_javadir}/commons-modeler.jar plugins/org.eclipse.tomcat/commons-modeler.jar
#ln -sf %{_javadir}/regexp.jar plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar
#ln -sf %{_javadir}/jasper4-compiler.jar plugins/org.eclipse.tomcat/jasper-compiler.jar
#ln -sf %{_javadir}/jasper4-runtime.jar plugins/org.eclipse.tomcat/jasper-runtime.jar
#ln -sf %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/mx4j-jmx.jar
#ln -sf %{tomcat4dir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat/naming-common.jar
#ln -sf %{tomcat4dir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat/naming-factory.jar
#ln -sf %{tomcat4dir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat/naming-resources.jar
#ln -sf %{_javadir}/servlet.jar plugins/org.eclipse.tomcat/servlet.jar
#ln -sf %{tomcat4dir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat/servlets-common.jar
#ln -sf %{tomcat4dir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat/servlets-default.jar
#ln -sf %{tomcat4dir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat/servlets-invoker.jar
#ln -sf %{tomcat4dir}/server/lib/servlets-manager.jar plugins/org.eclipse.tomcat/servlets-manager.jar
#ln -sf %{tomcat4dir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/tomcat-coyote.jar
#ln -sf %{tomcat4dir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/tomcat-http11.jar
#ln -sf %{tomcat4dir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/tomcat-util.jar
## END TOMCAT4 ##
## BEGIN TOMCAT ##
rm -f plugins/org.eclipse.tomcat/commons-beanutils.jar
rm -f plugins/org.eclipse.tomcat/commons-collections.jar
rm -f plugins/org.eclipse.tomcat/commons-digester.jar
rm -f plugins/org.eclipse.tomcat/commons-logging-api.jar
rm -f plugins/org.eclipse.tomcat/commons-modeler.jar
rm -f plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar
rm -f plugins/org.eclipse.tomcat/servlet.jar
rm -f plugins/org.eclipse.tomcat/servlets-manager.jar
ln -sf %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar
ln -sf %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/catalina.jar
ln -sf %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat/catalina-optional.jar
ln -sf %{_javadir}/jakarta-commons-beanutils.jar plugins/org.eclipse.tomcat/jakarta-commons-beanutils.jar
ln -sf %{_javadir}/jakarta-commons-collections.jar plugins/org.eclipse.tomcat/jakarta-commons-collections.jar
ln -sf %{_javadir}/jakarta-commons-dbcp.jar plugins/org.eclipse.tomcat/jakarta-commons-dbcp.jar
ln -sf %{_javadir}/jakarta-commons-digester.jar plugins/org.eclipse.tomcat/jakarta-commons-digester.jar
ln -sf %{_javadir}/jakarta-commons-digester-rss.jar plugins/org.eclipse.tomcat/jakarta-commons-digester-rss.jar
ln -sf %{_javadir}/jakarta-commons-el.jar plugins/org.eclipse.tomcat/jakarta-commons-el.jar
ln -sf %{_javadir}/jakarta-commons-fileupload.jar plugins/org.eclipse.tomcat/jakarta-commons-fileupload.jar
ln -sf %{_javadir}/jakarta-commons-launcher.jar plugins/org.eclipse.tomcat/jakarta-commons-launcher.jar
ln -sf %{_javadir}/jakarta-commons-logging.jar plugins/org.eclipse.tomcat/jakarta-commons-logging.jar
ln -sf %{_javadir}/jakarta-commons-modeler.jar plugins/org.eclipse.tomcat/jakarta-commons-modeler.jar
ln -sf %{_javadir}/jakarta-commons-pool.jar plugins/org.eclipse.tomcat/jakarta-commons-pool.jar
ln -sf %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat/jasper-compiler.jar
ln -sf %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat/jasper-runtime.jar
ln -sf %{_javadir}/jspapi.jar plugins/org.eclipse.tomcat/jspapi.jar
ln -sf %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat/mx4j.jar
ln -sf %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat/mx4j-impl.jar
ln -sf %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/mx4j-jmx.jar
ln -sf %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat/naming-common.jar
ln -sf %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat/naming-factory.jar
ln -sf %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat/naming-resources.jar
ln -sf %{_javadir}/regexp.jar plugins/org.eclipse.tomcat/regexp.jar
ln -sf %{_javadir}/servletapi5.jar plugins/org.eclipse.tomcat/servletapi5.jar
ln -sf %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat/servlets-common.jar
ln -sf %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat/servlets-default.jar
ln -sf %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat/servlets-invoker.jar
ln -sf %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/tomcat-coyote.jar
ln -sf %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/tomcat-http11.jar
ln -sf %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/tomcat-util.jar
## END TOMCAT ##
# ------------------------------------------------------------------------
ln -sf %{_javadir}/junit.jar plugins/org.junit/junit.jar
@ -506,36 +537,22 @@ ant \
# Remove the jars that we're using from other packages so that we don't
# natively-compile them again
rm -f plugins/org.apache.ant_*/lib/ant-antlr.jar
rm -f plugins/org.apache.ant_*/lib/ant-apache-bcel.jar
rm -f plugins/org.apache.ant_*/lib/ant-apache-log4j.jar
rm -f plugins/org.apache.ant_*/lib/ant-apache-oro.jar
rm -f plugins/org.apache.ant_*/lib/ant-apache-regexp.jar
rm -f plugins/org.apache.ant_*/lib/ant-apache-resolver.jar
rm -f plugins/org.apache.ant_*/lib/ant-commons-logging.jar
rm -f plugins/org.apache.ant_*/lib/ant-jdepend.jar
rm -f plugins/org.apache.ant_*/lib/ant-jmf.jar
rm -f plugins/org.apache.ant_*/lib/ant-jsch.jar
rm -f plugins/org.apache.ant_*/lib/ant-junit.jar
rm -f plugins/org.apache.ant_*/lib/ant-launcher.jar
rm -f plugins/org.apache.ant_*/lib/ant-nodeps.jar
rm -f plugins/org.apache.ant_*/lib/ant-swing.jar
rm -f plugins/org.apache.ant_*/lib/ant-trax.jar
rm -f plugins/org.apache.ant_*/lib/ant.jar
rm -f plugins/org.apache.ant_*/lib/ant*.jar
rm -f plugins/org.eclipse.tomcat_*/*.jar
rm -f plugins/org.eclipse.team.cvs.ssh2_3.1.0/jsch-0.1.18.jar
rm -f plugins/org.junit_3.8.1/junit.jar
rm -f plugins/org.apache.lucene*/*.jar
# extract jdtCompilerAdapter.jar from org.eclipse.jdt.core_3.1.0.jar
unzip -d plugins plugins/org.eclipse.jdt.core_3.1.0.jar jdtCompilerAdapter.jar
# Native build -- do -O2 on x86 and ppc only (for now)
# see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20606, for example
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158308
%ifarch ppc
mv plugins/org.eclipse.jdt.ui_3.1.0.jar{,.bak}
%endif
# Native build -- do -O2 on x86 and ppc only (for now)
# see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20606, for example
%ifarch %{ix86} ppc
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
for j in `find -name \*.jar`; do
@ -554,6 +571,7 @@ ant \
done
%endif
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158308
%ifarch ppc
mv plugins/org.eclipse.jdt.ui_3.1.0.jar{.bak,}
%endif
@ -794,35 +812,51 @@ ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_*/lib/ant-trax.jar
# plugins/org.eclipse.osgi.util_*/util.jar
#===> ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
# plugins/org.eclipse.text/text_*.jar
## BEGIN TOMCAT4 ##
##ln -sf %{tomcat4dir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/bootstrap.jar
#ln -sf %{tomcat4dir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/catalina.jar
#ln -sf %{_javadir}/commons-beanutils.jar plugins/org.eclipse.tomcat_*/commons-beanutils.jar
#ln -sf %{_javadir}/commons-collections.jar plugins/org.eclipse.tomcat_*/commons-collections.jar
#ln -sf %{_javadir}/commons-digester.jar plugins/org.eclipse.tomcat_*/commons-digester.jar
#ln -sf %{_javadir}/commons-logging-api.jar plugins/org.eclipse.tomcat_*/commons-logging-api.jar
#ln -sf %{_javadir}/commons-logging.jar plugins/org.eclipse.tomcat_*/commons-logging.jar
#ln -sf %{_javadir}/commons-modeler.jar plugins/org.eclipse.tomcat_*/commons-modeler.jar
#ln -sf %{_javadir}/regexp.jar plugins/org.eclipse.tomcat_*/jakarta-regexp-1.3.jar
#ln -sf %{_javadir}/jasper4-compiler.jar plugins/org.eclipse.tomcat_*/jasper-compiler.jar
#ln -sf %{_javadir}/jasper4-runtime.jar plugins/org.eclipse.tomcat_*/jasper-runtime.jar
#ln -sf %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_*/mx4j-jmx.jar
#ln -sf %{tomcat4dir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat_*/naming-common.jar
#ln -sf %{tomcat4dir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_*/naming-factory.jar
#ln -sf %{tomcat4dir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_*/naming-resources.jar
#ln -sf %{_javadir}/servlet.jar plugins/org.eclipse.tomcat_*/servlet.jar
#ln -sf %{tomcat4dir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat_*/servlets-common.jar
#ln -sf %{tomcat4dir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/servlets-default.jar
#ln -sf %{tomcat4dir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/servlets-invoker.jar
#ln -sf %{tomcat4dir}/server/lib/servlets-manager.jar plugins/org.eclipse.tomcat_*/servlets-manager.jar
#ln -sf %{tomcat4dir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/tomcat-coyote.jar
#ln -sf %{tomcat4dir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/tomcat-http11.jar
#ln -sf %{tomcat4dir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/tomcat-util.jar
## END TOMCAT4 ##
## BEGIN TOMCAT ##
rm -f plugins/org.eclipse.tomcat_*/commons-beanutils.jar
rm -f plugins/org.eclipse.tomcat_*/commons-collections.jar
rm -f plugins/org.eclipse.tomcat_*/commons-digester.jar
rm -f plugins/org.eclipse.tomcat_*/commons-logging-api.jar
rm -f plugins/org.eclipse.tomcat_*/commons-modeler.jar
rm -f plugins/org.eclipse.tomcat_*/jakarta-regexp-1.3.jar
rm -f plugins/org.eclipse.tomcat_*/servlet.jar
rm -f plugins/org.eclipse.tomcat_*/servlets-manager.jar
ln -sf %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/bootstrap.jar
ln -sf %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/catalina.jar
ln -sf %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_*/catalina-optional.jar
ln -sf %{_javadir}/jakarta-commons-beanutils.jar plugins/org.eclipse.tomcat_*/jakarta-commons-beanutils.jar
ln -sf %{_javadir}/jakarta-commons-collections.jar plugins/org.eclipse.tomcat_*/jakarta-commons-collections.jar
ln -sf %{_javadir}/jakarta-commons-dbcp.jar plugins/org.eclipse.tomcat_*/jakarta-commons-dbcp.jar
ln -sf %{_javadir}/jakarta-commons-digester.jar plugins/org.eclipse.tomcat_*/jakarta-commons-digester.jar
ln -sf %{_javadir}/jakarta-commons-digester-rss.jar plugins/org.eclipse.tomcat_*/jakarta-commons-digester-rss.jar
ln -sf %{_javadir}/jakarta-commons-el.jar plugins/org.eclipse.tomcat_*/jakarta-commons-el.jar
ln -sf %{_javadir}/jakarta-commons-fileupload.jar plugins/org.eclipse.tomcat_*/jakarta-commons-fileupload.jar
ln -sf %{_javadir}/jakarta-commons-launcher.jar plugins/org.eclipse.tomcat_*/jakarta-commons-launcher.jar
ln -sf %{_javadir}/jakarta-commons-logging.jar plugins/org.eclipse.tomcat_*/jakarta-commons-logging.jar
ln -sf %{_javadir}/jakarta-commons-modeler.jar plugins/org.eclipse.tomcat_*/jakarta-commons-modeler.jar
ln -sf %{_javadir}/jakarta-commons-pool.jar plugins/org.eclipse.tomcat_*/jakarta-commons-pool.jar
ln -sf %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat_*/jasper-compiler.jar
ln -sf %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat_*/jasper-runtime.jar
ln -sf %{_javadir}/jspapi.jar plugins/org.eclipse.tomcat_*/jspapi.jar
ln -sf %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_*/mx4j.jar
ln -sf %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_*/mx4j-impl.jar
ln -sf %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_*/mx4j-jmx.jar
ln -sf %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat_*/naming-common.jar
ln -sf %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_*/naming-factory.jar
ln -sf %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_*/naming-resources.jar
ln -sf %{_javadir}/regexp.jar plugins/org.eclipse.tomcat_*/regexp.jar
ln -sf %{_javadir}/servletapi5.jar plugins/org.eclipse.tomcat_*/servletapi5.jar
ln -sf %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat_*/servlets-common.jar
ln -sf %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/servlets-default.jar
ln -sf %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/servlets-invoker.jar
ln -sf %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/tomcat-coyote.jar
ln -sf %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/tomcat-http11.jar
ln -sf %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/tomcat-util.jar
## END TOMCAT ##
ln -sf %{_javadir}/junit.jar plugins/org.junit_*/junit.jar
# Symlink org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar in
# %{_datadir}/java/eclipse-ecj.jar for java-1.4.2-gcj-compat's "java"
# %{_datadir}/java/eclipse-ecj.jar for java-1.4.2-gcj-compat's "javac"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/java
ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar \
$RPM_BUILD_ROOT%{_datadir}/java/eclipse-ecj.jar
@ -1092,11 +1126,6 @@ fi
%{_libdir}/%{name}/plugins/org.eclipse.ant.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.ui.console_3.1.0.jar.so
# FIXME build packages for these so we don't have their jars and jar.sos in
# eclipse-platform
%{_libdir}/%{name}/plugins/org.apache.lucene_1.4.3
%{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1
%{_libdir}/%{name}/plugins/org.apache.ant_1.6.3
%endif
%files platform-devel
@ -1105,6 +1134,9 @@ fi
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
%changelog
* Tue Jun 14 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M7.9
- Add tomcat5 patch and symlinks.
* Thu May 26 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M7.8
- Fix ant jar removal (gbenson).

View File

@ -1,3 +1,3 @@
a51cad364164de7c3cd65bf48037a8f9 eclipse-native-splash-3.1-M7.png
30279e8c74de2db219418f645291be39 eclipse-sourceBuild-srcIncluded-3.1M7.zip
60f8146948470d0ef7c275f26b874a31 ecj-M5.zip
30279e8c74de2db219418f645291be39 eclipse-sourceBuild-srcIncluded-3.1M7.zip