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

Enable support for jetty 9.

Browse Source 
Improve the swt symlink to work well when sclized.
This commit is contained in:
Krzysztof Daniel 2013-03-01 09:37:27 +01:00
parent 432494e63b
commit cc03dc0fa2
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
eclipse.spec
View File

@ -55,7 +55,7 @@ fi;
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
Release: 0.20.git3fd9eca%{?dist}
Release: 0.21.git3fd9eca%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@ -164,13 +164,13 @@ BuildRequires: apache-commons-codec >= 1.6-2
BuildRequires: jakarta-commons-httpclient >= 1:3.1-7
BuildRequires: felix-gogo-command >= 0.12
BuildRequires: felix-gogo-shell >= 0.10.0-3
BuildRequires: osgi(org.eclipse.jetty.util) >= 8.1.0-1
BuildRequires: osgi(org.eclipse.jetty.server) >= 8.1.0-1
BuildRequires: osgi(org.eclipse.jetty.http) >= 8.1.0-1
BuildRequires: osgi(org.eclipse.jetty.continuation) >= 8.1.0-1
BuildRequires: osgi(org.eclipse.jetty.io) >= 8.1.0-1
BuildRequires: osgi(org.eclipse.jetty.security) >= 8.1.0-1
BuildRequires: osgi(org.eclipse.jetty.servlet) >= 8.1.0-1
BuildRequires: osgi(org.eclipse.jetty.util) >= 9
BuildRequires: osgi(org.eclipse.jetty.server) >= 9
BuildRequires: osgi(org.eclipse.jetty.http) >= 9
BuildRequires: osgi(org.eclipse.jetty.continuation) >= 9
BuildRequires: osgi(org.eclipse.jetty.io) >= 9
BuildRequires: osgi(org.eclipse.jetty.security) >= 9
BuildRequires: osgi(org.eclipse.jetty.servlet) >= 9
BuildRequires: lucene >= 2.9.4-8
BuildRequires: lucene-contrib >= 2.9.4-8
BuildRequires: junit >= 4.10-5
@ -240,13 +240,13 @@ Requires: apache-commons-codec >= 1.6-2
Requires: jakarta-commons-httpclient >= 1:3.1-7
Requires: felix-gogo-command >= 0.12
Requires: felix-gogo-shell >= 0.10.0-3
Requires: osgi(org.eclipse.jetty.util) >= 8.1.0-1
Requires: osgi(org.eclipse.jetty.server) >= 8.1.0-1
Requires: osgi(org.eclipse.jetty.http) >= 8.1.0-1
Requires: osgi(org.eclipse.jetty.continuation) >= 8.1.0-1
Requires: osgi(org.eclipse.jetty.io) >= 8.1.0-1
Requires: osgi(org.eclipse.jetty.security) >= 8.1.0-1
Requires: osgi(org.eclipse.jetty.servlet) >= 8.1.0-1
Requires: osgi(org.eclipse.jetty.util) >= 9
Requires: osgi(org.eclipse.jetty.server) >= 9
Requires: osgi(org.eclipse.jetty.http) >= 9
Requires: osgi(org.eclipse.jetty.continuation) >= 9
Requires: osgi(org.eclipse.jetty.io) >= 9
Requires: osgi(org.eclipse.jetty.security) >= 9
Requires: osgi(org.eclipse.jetty.servlet) >= 9
Requires: jsch >= 0.1.46-2
Requires: lucene >= 2.9.4-8
Requires: lucene-contrib >= 2.9.4-8
@ -345,8 +345,7 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch20
%patch21
%patch22
#Uncomment this patch to enable support for jetty 9.
#%%patch23
%patch23
#Disable as many things as possible to make the build faster. We care only for Eclipse.
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
@ -482,7 +481,6 @@ sed -i -e 's@!long@long@' eclipse-parent/pom.xml
%pom_remove_plugin org.mortbay.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp
find eclipse.platform.ua -name pom.xml -exec sed -i -e 's@org.apache.lucene<@org.apache.lucene.core<@g' {} \;
find . -name MANIFEST.MF -exec sed -i -e 's@9.0.0)@9.1.0]@' {} \;
%build
#This is the lowest value where the build succeeds. 512m is not enough.
export MAVEN_OPTS="-Xmx900m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState"
@ -775,7 +773,7 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{
%{_libdir}/%{pkg_name}/plugins/org.eclipse.swt.gtk.linux.*
%{_libdir}/%{pkg_name}/swt-gtk*.jar
%{_libdir}/%{pkg_name}/swt.jar
%{_usr}/lib/java/swt.jar
%{_libdir}/../lib/java/swt.jar
%files platform -f .mfiles-platform
@ -1013,6 +1011,10 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog
* Thu Feb 28 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.21.git3fd9eca
- Enable support for jetty 9.
- Improve the swt symlink to work well when sclized.
* Wed Feb 27 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.20.git3fd9eca
- Remove easymock and junit duplications from tests.