From 2bbf755950e88bd2b42e8f8abcd5ad91e53b9389ab4335c7643f2a50b9646756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 May 2017 09:07:23 +0000 Subject: [PATCH] - Fix build with new javapackages-tools OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant-contrib?expand=0&rev=26 --- ant-contrib.changes | 5 +++++ ant-contrib.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ant-contrib.changes b/ant-contrib.changes index ba70794..42f5d75 100644 --- a/ant-contrib.changes +++ b/ant-contrib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 19 09:08:21 UTC 2017 - tchvatal@suse.com + +- Fix build with new javapackages-tools + ------------------------------------------------------------------- Wed Mar 18 09:42:22 UTC 2015 - tchvatal@suse.com diff --git a/ant-contrib.spec b/ant-contrib.spec index f0c1055..f65a87a 100644 --- a/ant-contrib.spec +++ b/ant-contrib.spec @@ -1,7 +1,7 @@ # # spec file for package ant-contrib # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,12 +32,13 @@ Patch0: local-ivy.patch Patch1: ant-contrib-antservertest.patch Patch2: ant-contrib-pom.patch Patch3: ant-contrib-1.0b3-enable-for-task.patch -BuildRequires: ant >= 1.7.1 +BuildRequires: ant BuildRequires: apache-ivy BuildRequires: bcel >= 5.1 BuildRequires: commons-httpclient BuildRequires: commons-logging BuildRequires: java-devel +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit BuildRequires: xerces-j2