Update to latest I-build and fix build on 32bit intel platform

Tighten deps on batik to prevent runtime bundle resolution errors
This commit is contained in:
Mat Booth 2018-04-28 17:30:25 +01:00
parent c48d605385
commit be32b7c751
3 changed files with 16 additions and 6 deletions

View File

@ -6,7 +6,7 @@
Epoch: 1
%global eb_commit 81122c55c72d9e308302c878f642f93c39507436
%global eclipse_tag I20180423-2000
%global eclipse_tag I20180427-2000
%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
%global _jetty_version 9.4.9
@ -44,7 +44,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.8.0
Release: 0.1%{?dist}
Release: 0.2%{?dist}
License: EPL
URL: http://www.eclipse.org/
@ -190,8 +190,9 @@ BuildRequires: junit5
BuildRequires: apiguardian
BuildRequires: hamcrest >= 1.3
BuildRequires: sat4j
BuildRequires: objectweb-asm >= 6.0
BuildRequires: objectweb-asm >= 6.1.1
BuildRequires: sac
BuildRequires: batik >= 1.9-7
BuildRequires: batik-css >= 1.9-7
BuildRequires: xmlgraphics-commons >= 2.2
BuildRequires: xml-commons-apis
@ -275,6 +276,7 @@ Requires: lucene-queryparser >= %{_lucene_version}
Requires: lucene-analyzers-smartcn >= %{_lucene_version}
Requires: sat4j
Requires: sac
Requires: batik >= 1.9-7
Requires: batik-css >= 1.9-7
Requires: xmlgraphics-commons >= 2.2
Requires: xml-commons-apis
@ -328,7 +330,7 @@ Summary: Eclipse Plugin Development Environment
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
Requires: objectweb-asm >= 6.0
Requires: objectweb-asm >= 6.1.1
%description pde
Eclipse Plugin Development Environment. This package is required for
@ -617,6 +619,10 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.
ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/
ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.log.stream/osgi/
# This test doesn't build on 32bit
# See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=534174
rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug421127_Clipping_is_wrong.java
# The order of these mvn_package calls is important
%mvn_package "::pom::" __noinstall
%mvn_package ":*tests*" tests
@ -1070,6 +1076,10 @@ fi
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
* Sat Apr 28 2018 Mat Booth <mat.booth@redhat.com> - 1:4.8.0-0.2
- Update to latest I-build and fix build on 32bit intel platform
- Tighten deps on batik to prevent runtime bundle resolution errors
* Tue Apr 24 2018 Mat Booth <mat.booth@redhat.com> - 1:4.8.0-0.1
- Update to Photon I-build
- Remove conditional for webkit2 (always use it now)

View File

@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
TAG=I20180423-2000
TAG=I20180427-2000
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz

View File

@ -1,2 +1,2 @@
SHA512 (org.eclipse.linuxtools.eclipse-build-81122c55c72d9e308302c878f642f93c39507436.tar.xz) = 170d6801fd2c2f5f95c4d79cb14e36bb5db63142a52cafea81656f63dd132cf1a5b52b945fa0f85d4eed21ed660d22f46d2cdf9cde86e08fed06b16e9a22ed51
SHA512 (R4_platform-aggregator-I20180423-2000.tar.xz) = a86451382cb0a66f88293920064e886cf053737605a5d968d911890c8665f1a02dcec2da06e3e81ef701fb12cdeaa95dd2d47a8a995f7bc67db8d8b6bcbfe268
SHA512 (R4_platform-aggregator-I20180427-2000.tar.xz) = 79d1652fedeb19a2b0c528697fd54c155d8a12d11e9d8f061bf45f3c822b38b2b7cf431eb54ac0de9e79f7482b41fe6f553a6fd24e795edd0db7be19baed864d