From cf121cbdde2bd06e8e847381f351d6b30db47258 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Jun 20 2019 17:21:10 +0000 Subject: Fix deps on batik stack --- diff --git a/eclipse.spec b/eclipse.spec index 1f747fa..00a40f7 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -14,6 +14,7 @@ Epoch: 1 %global _jetty_version 9.4.19 %global _lucene_version 8.0.0 +%global _batik_version 1.11 %ifarch %{ix86} %global eclipse_arch x86 @@ -41,7 +42,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.12 -Release: 3%{?dist} +Release: 4%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -187,8 +188,8 @@ BuildRequires: hamcrest BuildRequires: sat4j BuildRequires: objectweb-asm >= 7.0 BuildRequires: sac -BuildRequires: batik-css >= 1.11 -BuildRequires: batik-util >= 1.11 +BuildRequires: batik-css >= %{_batik_version} +BuildRequires: batik-util >= %{_batik_version} BuildRequires: google-gson BuildRequires: xmlgraphics-commons >= 2.3 BuildRequires: xml-commons-apis @@ -273,9 +274,9 @@ Requires: lucene-queryparser >= %{_lucene_version} Requires: lucene-analyzers-smartcn >= %{_lucene_version} Requires: sat4j Requires: sac -Requires: batik >= 1.10 -Requires: batik-css >= 1.10 -Requires: xmlgraphics-commons >= 2.2 +Requires: batik-css >= %{_batik_version} +Requires: batik-util >= %{_batik_version} +Requires: xmlgraphics-commons >= 2.3 Requires: xml-commons-apis Requires: atinject Requires: eclipse-ecf-core >= 3.14.5 @@ -1105,6 +1106,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Thu Jun 20 2019 Mat Booth - 1:4.12-4 +- Fix deps on batik stack + * Thu Jun 20 2019 Mat Booth - 1:4.12-3 - Disable more examples and allow contrib-tools mode to build properly