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

use glassfish 2.2.6

Browse Source 
dont install jdt into platform (to be explained later).
remove webapp patches (not needed, because jsp compilation works now).
This commit is contained in:
Krzysztof Daniel 2012-08-30 17:23:01 +02:00
parent d2bcfb6988
commit 023045a22d
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eclipse.spec
View File

@ -168,8 +168,6 @@ Patch24: %{name}-pdebuild-add-target.patch
Patch25: %{name}-change-build-packagings.patch
Patch26: %{name}-compile-webapp.patch
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
BuildRequires: jpackage-utils >= 0:1.5, make, gcc
@ -222,7 +220,7 @@ BuildRequires: eclipse-ecf-core
BuildRequires: tomcat-servlet-3.0-api
BuildRequires: tomcat6-servlet-2.5-api
BuildRequires: cglib
BuildRequires: glassfish-jsp >= 2.2.5
BuildRequires: glassfish-jsp >= 2.2.6
%if 0%{?rhel} >= 6
ExclusiveArch: %{ix86} x86_64
@ -283,7 +281,7 @@ Requires: geronimo-annotation >= 1.0-7
Requires: eclipse-ecf-core
Requires: eclipse-emf-core
Requires: tomcat-servlet-3.0-api
Requires: glassfish-jsp >= 2.2.5
Requires: glassfish-jsp >= 2.2.6
Requires: icu4j-eclipse >= 1:4.4.2.2-11
Requires: eclipse-swt = %{epoch}:%{eclipse_version}-%{release}
Requires: eclipse-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
@ -367,7 +365,6 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch23
%patch24
%patch25
%patch26
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040
%pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles .
@ -511,7 +508,6 @@ pushd plugins
%_symlink org.apache.commons.codec_ commons-codec.jar
%_symlink org.apache.commons.httpclient_ commons-httpclient.jar
%_symlink org.apache.commons.logging_ commons-logging.jar
%_symlink org.apache.el_ tomcat/jasper-el.jar
%_symlink org.apache.felix.gogo.command_ felix/org.apache.felix.gogo.command.jar
%_symlink org.apache.felix.gogo.runtime_ felix/org.apache.felix.gogo.runtime.jar
%_symlink org.apache.felix.gogo.shell_ felix/org.apache.felix.gogo.shell.jar
@ -581,7 +577,10 @@ cd org.apache.ant_*
popd
#enf of platform symlinking
#Install the jdt bundle right into the master Eclipse
#./eclipse -application org.eclipse.equinox.p2.director \
# -repository file:/`pwd`/../../../../../../../../jdtpde/target/repository \
# -installIU org.eclipse.jdt.core
#quit the eclipse folder
popd
@ -928,7 +927,6 @@ rm -rf %{_bindir}/efj/
%{_libdir}/%{name}/plugins/javax.el_*
%{_libdir}/%{name}/plugins/javax.inject_*.jar
%{_libdir}/%{name}/plugins/javax.xml_1.3.4.*.jar
%{_libdir}/%{name}/plugins/org.apache.el_*
%{_libdir}/%{name}/plugins/org.apache.ant_*
%{_libdir}/%{name}/plugins/org.apache.batik.css_*
%{_libdir}/%{name}/plugins/org.apache.batik.util.gui_*