From 4a63eb6fb9fbef9032b1323c5878cf02c93c2949 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: May 18 2017 14:45:01 +0000 Subject: Enable Wayland backend by default on F27+ Bump some dependency requirements --- diff --git a/eclipse.spec b/eclipse.spec index a7c9274..da59611 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -38,7 +38,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.7.0 -Release: 0.11%{?dist} +Release: 0.12%{?dist} License: EPL URL: http://www.eclipse.org/ @@ -153,7 +153,7 @@ BuildRequires: pkgconfig(webkitgtk-3.0) %else BuildRequires: pkgconfig(webkit2gtk-4.0) %endif -BuildRequires: icu4j >= 1:58.2 +BuildRequires: icu4j >= 1:59.1 BuildRequires: ant >= 1.10.1 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 @@ -166,7 +166,7 @@ BuildRequires: apache-commons-fileupload BuildRequires: osgi(org.apache.felix.gogo.shell) >= 1.0.0 BuildRequires: osgi(org.apache.felix.gogo.command) >= 1.0.2 BuildRequires: osgi(org.apache.felix.gogo.runtime) >= 1.0.4 -BuildRequires: osgi(org.apache.felix.scr) >= 2.0.8 +BuildRequires: osgi(org.apache.felix.scr) >= 2.0.10 BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version} BuildRequires: osgi(org.eclipse.jetty.server) >= %{_jetty_version} BuildRequires: osgi(org.eclipse.jetty.http) >= %{_jetty_version} @@ -247,6 +247,7 @@ Summary: Eclipse platform common files Recommends: eclipse-abrt Recommends: eclipse-usage +Requires: ant >= 1.10.1 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 Requires: jsch >= 0.1.46-2 @@ -257,7 +258,7 @@ Requires: apache-commons-jxpath Requires: osgi(org.apache.felix.gogo.shell) >= 1.0.0 Requires: osgi(org.apache.felix.gogo.command) >= 1.0.2 Requires: osgi(org.apache.felix.gogo.runtime) >= 1.0.4 -Requires: osgi(org.apache.felix.scr) >= 2.0.8 +Requires: osgi(org.apache.felix.scr) >= 2.0.10 Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version} Requires: osgi(org.eclipse.jetty.server) >= %{_jetty_version} Requires: osgi(org.eclipse.jetty.http) >= %{_jetty_version} @@ -282,18 +283,12 @@ Requires: glassfish-el >= 3.0.1 Requires: glassfish-jsp-api >= 2.2.1-4 Requires: glassfish-jsp >= 2.2.5 Requires: glassfish-servlet-api >= 3.1.0 -Requires: icu4j >= 1:58.2 +Requires: icu4j >= 1:59.1 Requires: %{name}-swt = %{epoch}:%{version}-%{release} Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release} Requires: httpcomponents-core Requires: httpcomponents-client -%if 0%{?fedora} >= 26 -Requires: ant >= 1.10.1 Requires: osgi(org.tukaani.xz) >= 1.6 -%else -Requires: ant >= 1.9.6 -Requires: osgi(org.tukaani.xz) -%endif # Provides/obsoletes added in F26 # This is the best place to add this because adding it to the nls RPMs causes every @@ -391,7 +386,10 @@ tar --strip-components=1 -xf %{SOURCE1} %patch24 %patch26 %patch27 +%if 0%{?rhel} || 0%{?fedora} < 27 +# Enable wayland by default on F27+ %patch28 +%endif %patch29 %patch30 @@ -1047,6 +1045,10 @@ fi %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Thu May 18 2017 Mat Booth - 1:4.7.0-0.12 +- Enable Wayland backend by default on F27+ +- Bump some dependency requirements + * Tue May 16 2017 Mat Booth - 1:4.7.0-0.11 - Update to latest I-build - Rebuild for latest EMF