From f04da6c5794d17db5fc4f71f5737d8d7e261e062 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Aug 21 2018 14:02:25 +0000 Subject: Fix build on ppc64 and tighten up the dep on ant --- diff --git a/eclipse.spec b/eclipse.spec index fc16f90..dd89786 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -152,7 +152,7 @@ BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: icu4j >= 1:62.1 -BuildRequires: ant >= 1.10.1 +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 @@ -240,7 +240,7 @@ Summary: Eclipse platform common files %{?fedora:Recommends}%{!?fedora:Requires}: eclipse-abrt %{?fedora:Recommends}%{!?fedora:Requires}: eclipse-usage -Requires: ant >= 1.10.1 +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 @@ -450,7 +450,7 @@ sed -i -e '/org\.eclipse\.jdt\.annotation;bundle-version="\[1\.1\.0,2\.0\.0)"/d' %pom_disable_module bundles/org.eclipse.equinox.servletbridge.template rt.equinox.bundles # This part generates secondary fragments using primary fragments -for dir in rt.equinox.binaries eclipse.platform.swt.binaries/bundles ; do +for dir in rt.equinox.binaries rt.equinox.framework/bundles eclipse.platform.swt.binaries/bundles ; do utils/ensure_arch.sh "$dir" x86 arm utils/ensure_arch.sh "$dir" x86_64 aarch64 ppc64 done