Rebuild for s390x

Don't require JDK directly
This commit is contained in:
Mat Booth 2017-05-02 12:34:09 +01:00
parent 1d99f99767
commit 6db7b846d4
1 changed files with 8 additions and 6 deletions

View File

@ -20,7 +20,7 @@ Epoch: 1
%ifarch ppc64 ppc64p7
%global eclipse_arch ppc64
%endif
%ifarch s390 s390x x86_64 aarch64 ppc64le
%ifarch s390x x86_64 aarch64 ppc64le
%global eclipse_arch %{_arch}
%endif
@ -123,6 +123,7 @@ Patch29: fix_ant_build.patch
# Hide the p2 Droplets from cluttering Install Wizard Combo
Patch30: eclipse-hide-droplets-from-install-wizard.patch
BuildRequires: maven-local
BuildRequires: tycho >= 0.25.0
BuildRequires: tycho-extras >= 0.25.0
BuildRequires: cbi-plugins
@ -135,7 +136,6 @@ BuildRequires: rsync
BuildRequires: make, gcc
BuildRequires: zip, unzip
BuildRequires: desktop-file-utils
BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(nspr)
@ -153,7 +153,8 @@ BuildRequires: pkgconfig(webkitgtk-3.0)
%else
BuildRequires: pkgconfig(webkit2gtk-4.0)
%endif
BuildRequires: icu4j >= 1:54.1.1-2
BuildRequires: icu4j >= 1:58.2
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
BuildRequires: jsch >= 0:0.1.46-2
@ -181,7 +182,7 @@ BuildRequires: junit >= 4.12
BuildRequires: hamcrest >= 1.3
BuildRequires: sat4j >= 2.3.5-1
BuildRequires: objectweb-asm >= 5.0.3-1
BuildRequires: sac >= 1.3-12
BuildRequires: sac
BuildRequires: batik-css
BuildRequires: xml-commons-apis
BuildRequires: atinject
@ -268,7 +269,7 @@ Requires: lucene-analysis >= %{_lucene_version}
Requires: lucene-queryparser >= %{_lucene_version}
Requires: lucene-analyzers-smartcn >= %{_lucene_version}
Requires: sat4j >= 2.3.5-1
Requires: sac >= 1.3-12
Requires: sac
Requires: batik-css
Requires: xml-commons-apis
Requires: atinject
@ -279,7 +280,7 @@ 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:54.1.1-2
Requires: icu4j >= 1:58.2
Requires: %{name}-swt = %{epoch}:%{version}-%{release}
Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release}
Requires: httpcomponents-core
@ -1032,6 +1033,7 @@ fi
%changelog
* Tue May 02 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.0-0.7
- Rebuild for s390x
- Don't require JDK directly
* Fri Apr 28 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.0-0.6
- Non-bootstrap build