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

- Add jsp-api dependency and use the tomcat6 one.

Browse Source
This commit is contained in:
akurtakov 2010-09-21 05:08:47 -04:00
parent 89854db15f
commit 5e366bf9c6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eclipse.spec
View File

@ -27,7 +27,7 @@ Epoch: 1
Summary: An open, extensible IDE Summary: An open, extensible IDE
Name: eclipse Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro} Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 10%{?dist} Release: 11%{?dist}
License: EPL License: EPL
Group: Text Editors/Integrated Development Environments (IDE) Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/ URL: http://www.eclipse.org/
@ -69,6 +69,7 @@ BuildRequires: webkitgtk-devel
BuildRequires: icu4j-eclipse >= 1:4.2.1-1 BuildRequires: icu4j-eclipse >= 1:4.2.1-1
BuildRequires: tomcat5-jasper-eclipse >= 5.5.27-6.3 BuildRequires: tomcat5-jasper-eclipse >= 5.5.27-6.3
BuildRequires: tomcat6-servlet-2.5-api >= 6.0.18-9.2 BuildRequires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
BuildRequires: tomcat6-jsp-2.1-api
BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch
BuildRequires: jsch >= 0:0.1.41 BuildRequires: jsch >= 0:0.1.41
@ -132,6 +133,7 @@ Requires: apache-commons-logging >= 1.0.4-6jpp.3
Requires: apache-commons-codec Requires: apache-commons-codec
Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3 Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3
Requires: tomcat6-servlet-2.5-api >= 6.0.18-9.2 Requires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
Requires: tomcat6-jsp-2.1-api
Requires: jetty >= 6.1.24-1 Requires: jetty >= 6.1.24-1
Requires: jsch >= 0.1.41 Requires: jsch >= 0.1.41
Requires: lucene >= 2.3.1-3.4 Requires: lucene >= 2.3.1-3.4
@ -187,6 +189,7 @@ developing Eclipse plugins.
cp %{SOURCE1} . cp %{SOURCE1} .
ant -DbuildArch=%{eclipse_arch} applyPatches ant -DbuildArch=%{eclipse_arch} applyPatches
sed -i -e "s|org.apache.ant_1.7.1.v20100518-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-trax.jar:/usr/share/java/ant-trax.jar||g" nonosgidependencies.properties sed -i -e "s|org.apache.ant_1.7.1.v20100518-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-trax.jar:/usr/share/java/ant-trax.jar||g" nonosgidependencies.properties
sed -i -e "s|tomcat5-jsp-2.0-api|tomcat6-jsp-2.1-api|g" dependencies.properties
pushd build/eclipse-%{version}-src pushd build/eclipse-%{version}-src
%patch0 %patch0
pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library/ pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library/
@ -591,6 +594,9 @@ fi
%{_libdir}/%{name}/configuration/org.eclipse.equinox.source %{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog %changelog
* Tue Sep 21 2010 Alexander Kurtakov <akurtako@redhat.com> 1:3.6.0-11
- Add jsp-api dependency and use the tomcat6 one.
* Fri Sep 17 2010 Jeff Johnston <jjohnstn@redhat.com> 1:3.6.0-10 * Fri Sep 17 2010 Jeff Johnston <jjohnstn@redhat.com> 1:3.6.0-10
- Add patch to fix xpcom problem. - Add patch to fix xpcom problem.