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

Build against jetty 8 in sclized version.

Browse Source
This commit is contained in:
Krzysztof Daniel 2013-03-18 20:16:10 +01:00
parent 3ac85ea950
commit 1ee81143a8
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
eclipse.spec
View File

@ -14,7 +14,7 @@ Epoch: 1
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
%global installation_loc %{_libdir}/%{pkg_name}
%{?scl:%global _jetty_version 9}
%global _jetty_version 9
%{?scl:%global _jetty_version 8}
%ifarch %{ix86}
@ -57,7 +57,7 @@ fi;
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
Release: 0.26.git38f1df9%{?dist}
Release: 0.27.git38f1df9%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@ -161,13 +161,13 @@ BuildRequires: apache-commons-logging
BuildRequires: apache-commons-codec >= 1.6-2
BuildRequires: %{?scl_prefix}felix-gogo-command >= 0.12
BuildRequires: %{?scl_prefix}felix-gogo-shell >= 0.10.0-3
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: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.continuation) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
BuildRequires: lucene >= 2.9.4-8
BuildRequires: lucene-contrib >= 2.9.4-8
BuildRequires: junit >= 4.10-5
@ -241,13 +241,13 @@ Requires: apache-commons-logging
Requires: apache-commons-codec >= 1.6-2
Requires: %{?scl_prefix}felix-gogo-command >= 0.12
Requires: %{?scl_prefix}felix-gogo-shell >= 0.10.0-3
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: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.continuation) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
Requires: jsch >= 0.1.46-2
Requires: lucene >= 2.9.4-8
Requires: lucene-contrib >= 2.9.4-8
@ -346,7 +346,7 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch20
%patch21
%patch22
%patch23
%{!?scl:%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
@ -1010,6 +1010,9 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog
* Mon Mar 18 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.27.git38f1df9
- Build against jetty 8 in sclized version.
* Mon Mar 18 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.26.git38f1df9
- RHBZ#902842 calls mvn-rpmbuild with -Dmaven.local.mode=true