- BR/R tomcat5 >= 5.5.23.
- Fix broken symlinks for tomcat5 5.5.23.
This commit is contained in:
Ben Konrath
parent
f7bb7ca86e
commit
121b65f9ff
57
eclipse.spec
57
eclipse.spec
|
|
@ -2,7 +2,6 @@ Epoch: 1
|
|||
|
||||
%define gcj_support 1
|
||||
%define tomcatsharedir %{_datadir}/tomcat5
|
||||
%define tomcatlibdir %{_var}/lib/tomcat5
|
||||
%define eclipse_major 3
|
||||
%define eclipse_minor 2
|
||||
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
|
||||
|
|
@ -19,7 +18,7 @@ Epoch: 1
|
|||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||
Release: 13%{?dist}
|
||||
Release: 14%{?dist}
|
||||
License: Eclipse Public License
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
|
|
@ -138,9 +137,9 @@ BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax
|
|||
BuildRequires: jsch >= 0:0.1.28-1jpp.6
|
||||
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.20
|
||||
BuildRequires: tomcat5-jasper >= 5.5.20
|
||||
BuildRequires: tomcat5-servlet-2.4-api >= 5.5.20
|
||||
BuildRequires: tomcat5 >= 5.5.23
|
||||
BuildRequires: tomcat5-jasper >= 5.5.23
|
||||
BuildRequires: tomcat5-servlet-2.4-api >= 5.5.23
|
||||
BuildRequires: lucene
|
||||
BuildRequires: lucene-devel
|
||||
BuildRequires: regexp
|
||||
|
|
@ -236,9 +235,9 @@ Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-r
|
|||
Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
|
||||
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.20
|
||||
Requires: tomcat5-jasper >= 5.5.20
|
||||
Requires: tomcat5-servlet-2.4-api >= 5.5.20
|
||||
Requires: tomcat5 >= 5.5.23
|
||||
Requires: tomcat5-jasper >= 5.5.23
|
||||
Requires: tomcat5-servlet-2.4-api >= 5.5.23
|
||||
Requires: jsch >= 0:0.1.28-1jpp.6
|
||||
Requires: lucene, lucene-devel
|
||||
Requires: regexp
|
||||
|
|
@ -386,7 +385,7 @@ pushd plugins/org.eclipse.tomcat
|
|||
%patch6 -p0
|
||||
%patch7 -p0
|
||||
popd
|
||||
sed --in-place "s/4.1.130/5.5.20/g" \
|
||||
sed --in-place "s/4.1.130/5.5.23/g" \
|
||||
features/org.eclipse.platform/build.xml \
|
||||
plugins/org.eclipse.tomcat/build.xml \
|
||||
plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF \
|
||||
|
|
@ -609,20 +608,20 @@ rm plugins/org.eclipse.tomcat/tomcat-coyote.jar
|
|||
rm plugins/org.eclipse.tomcat/tomcat-util.jar
|
||||
mkdir -p plugins/org.eclipse.tomcat/lib
|
||||
ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/lib/bootstrap.jar
|
||||
ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/lib/catalina.jar
|
||||
ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat/lib/catalina-optional.jar
|
||||
ln -s %{_javadir}/tomcat5/catalina.jar plugins/org.eclipse.tomcat/lib/catalina.jar
|
||||
ln -s %{_javadir}/tomcat5/catalina-optional.jar plugins/org.eclipse.tomcat/lib/catalina-optional.jar
|
||||
ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat/lib/jasper-compiler.jar
|
||||
ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat/lib/jasper-runtime.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat/lib/mx4j.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat/lib/mx4j-impl.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/lib/mx4j-jmx.jar
|
||||
ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat/lib/naming-factory.jar
|
||||
ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat/lib/naming-resources.jar
|
||||
ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat/lib/servlets-default.jar
|
||||
ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat/lib/servlets-invoker.jar
|
||||
ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/lib/tomcat-coyote.jar
|
||||
ln -s %{tomcatlibdir}/server/lib/tomcat-http.jar plugins/org.eclipse.tomcat/lib/tomcat-http.jar
|
||||
ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/lib/tomcat-util.jar
|
||||
ln -s %{_javadir}/tomcat5/naming-factory.jar plugins/org.eclipse.tomcat/lib/naming-factory.jar
|
||||
ln -s %{_javadir}/tomcat5/naming-resources.jar plugins/org.eclipse.tomcat/lib/naming-resources.jar
|
||||
ln -s %{_javadir}/tomcat5/servlets-default.jar plugins/org.eclipse.tomcat/lib/servlets-default.jar
|
||||
ln -s %{_javadir}/tomcat5/servlets-invoker.jar plugins/org.eclipse.tomcat/lib/servlets-invoker.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-coyote.jar plugins/org.eclipse.tomcat/lib/tomcat-coyote.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-http.jar plugins/org.eclipse.tomcat/lib/tomcat-http.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-util.jar plugins/org.eclipse.tomcat/lib/tomcat-util.jar
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-beanutils
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-collections
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-dbcp
|
||||
|
|
@ -1186,20 +1185,20 @@ popd
|
|||
TOMCATPLUGINVERSION=$(ls plugins | grep tomcat | sed 's/org.eclipse.tomcat_//')
|
||||
mkdir -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib
|
||||
ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/bootstrap.jar
|
||||
ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/catalina.jar
|
||||
ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/catalina-optional.jar
|
||||
ln -s %{_javadir}/tomcat5/catalina.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/catalina.jar
|
||||
ln -s %{_javadir}/tomcat5/catalina-optional.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/catalina-optional.jar
|
||||
ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/jasper-compiler.jar
|
||||
ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/jasper-runtime.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/mx4j.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/mx4j-impl.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/mx4j-jmx.jar
|
||||
ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/naming-factory.jar
|
||||
ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/naming-resources.jar
|
||||
ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/servlets-default.jar
|
||||
ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/servlets-invoker.jar
|
||||
ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/tomcat-coyote.jar
|
||||
ln -s %{tomcatlibdir}/server/lib/tomcat-http.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/tomcat-http.jar
|
||||
ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/tomcat-util.jar
|
||||
ln -s %{_javadir}/tomcat5/naming-factory.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/naming-factory.jar
|
||||
ln -s %{_javadir}/tomcat5/naming-resources.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/naming-resources.jar
|
||||
ln -s %{_javadir}/tomcat5/servlets-default.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/servlets-default.jar
|
||||
ln -s %{_javadir}/tomcat5/servlets-invoker.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/servlets-invoker.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-coyote.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/tomcat-coyote.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-http.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/tomcat-http.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-util.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/tomcat-util.jar
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-beanutils
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-collections
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-dbcp
|
||||
|
|
@ -1718,6 +1717,10 @@ fi
|
|||
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
|
||||
|
||||
%changelog
|
||||
* Thu May 17 2007 Ben Konrath <bkonrath@redhat.com> 3.2.2-14
|
||||
- BR/R tomcat5 >= 5.5.23.
|
||||
- Fix broken symlinks for tomcat5 5.5.23.
|
||||
|
||||
* Tue May 15 2007 Ben Konrath <bkonrath@redhat.com> 3.2.2-13
|
||||
- Another bug fix for launch-addplatformtotildeeclipse.patch.
|
||||
- Add BR/B tomcat >= 5.5.20 instead of just = 5.5.20.
|
||||
|
|
|
|||
Loading…
Reference in New Issue