diff --git a/eclipse.spec b/eclipse.spec index e7c6714..a0e1606 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,7 +1,7 @@ # Set to build Eclipse without circular dependency to eclipse-pde, API # generation and docs will not be built and a second run will be required, but # this is a way to bootstrap Eclipse on secondary archs. -%bcond_without bootstrap +%bcond_with bootstrap # Set this to avoid building contributor tools and tests %bcond_with contrib_tools @@ -12,7 +12,7 @@ Epoch: 1 %global eclipse_rel %{version}RC2 %global eclipse_tag S-%{eclipse_rel}-201909071130 -%global _jetty_version 9.4.20 +%global _jetty_version 9.4.24 %global _lucene_version 8.1.1 %global _batik_version 1.11 @@ -42,7 +42,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.13 -Release: 6%{?dist} +Release: 7%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -193,8 +193,8 @@ BuildRequires: google-gson BuildRequires: xmlgraphics-commons >= 2.3 BuildRequires: xml-commons-apis BuildRequires: atinject -BuildRequires: eclipse-ecf-core >= 3.14.5 -BuildRequires: eclipse-emf-core >= 1:2.19.0 +BuildRequires: eclipse-ecf-core >= 3.14.6 +BuildRequires: eclipse-emf-core >= 1:2.20.0 BuildRequires: eclipse-license2 BuildRequires: glassfish-annotation-api BuildRequires: glassfish-el-api >= 3.0.1 @@ -276,8 +276,8 @@ Requires: batik-util >= %{_batik_version} Requires: xmlgraphics-commons >= 2.3 Requires: xml-commons-apis Requires: atinject -Requires: eclipse-ecf-core >= 3.14.5 -Requires: eclipse-emf-core >= 1:2.19.0 +Requires: eclipse-ecf-core >= 3.14.6 +Requires: eclipse-emf-core >= 1:2.20.0 Requires: glassfish-annotation-api Requires: glassfish-el-api >= 3.0.1 Requires: glassfish-el >= 3.0.1 @@ -1108,6 +1108,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Thu Dec 19 2019 Mat Booth - 1:4.13-7 +- Bump requirements on EMF/ECF + * Wed Dec 18 2019 Mat Booth - 1:4.13-6 - Remove unnecessary dep on apache-commons-el - Enable bootstrap mode