diff --git a/eclipse.spec b/eclipse.spec index f55d155..e7c6714 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,10 +1,10 @@ # 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_with bootstrap +%bcond_without bootstrap # Set this to avoid building contributor tools and tests -%bcond_without contrib_tools +%bcond_with contrib_tools Epoch: 1 @@ -42,7 +42,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.13 -Release: 5%{?dist} +Release: 6%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -161,7 +161,6 @@ BuildRequires: ant >= 1.10.5 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf BuildRequires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf ant-xz ant-junit5 BuildRequires: jsch >= 0:0.1.46-2 -BuildRequires: apache-commons-el >= 1.0-22 BuildRequires: apache-commons-logging BuildRequires: apache-commons-codec BuildRequires: apache-commons-jxpath @@ -252,7 +251,6 @@ Requires: ant >= 1.10.5 Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf Requires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf ant-xz ant-junit5 Requires: jsch >= 0.1.46-2 -Requires: apache-commons-el >= 1.0-23 Requires: apache-commons-logging Requires: apache-commons-codec Requires: apache-commons-jxpath @@ -1110,6 +1108,10 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Wed Dec 18 2019 Mat Booth - 1:4.13-6 +- Remove unnecessary dep on apache-commons-el +- Enable bootstrap mode + * Wed Nov 20 2019 Mat Booth - 1:4.13-5 - Obsolete retired packages