From 0ddb7e69745e4793273076d9da29fca0cd7afcbfaf35e085e81ed2545bfa1b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 May 2017 11:38:42 +0000 Subject: [PATCH] - Do not require the builddeps, only the tools we really use OBS-URL: https://build.opensuse.org/package/show/Java:packages/adaptx?expand=0&rev=16 --- adaptx.changes | 5 +++++ adaptx.spec | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/adaptx.changes b/adaptx.changes index d528952..5a200a6 100644 --- a/adaptx.changes +++ b/adaptx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 19 11:39:08 UTC 2017 - tchvatal@suse.com + +- Do not require the builddeps, only the tools we really use + ------------------------------------------------------------------- Thu Dec 4 16:48:19 UTC 2014 - p.drouand@gmail.com diff --git a/adaptx.spec b/adaptx.spec index a9f90d3..1b1dd99 100644 --- a/adaptx.spec +++ b/adaptx.spec @@ -1,7 +1,7 @@ # # spec file for package adaptx # -# Copyright (c) 2014 SUSE LINUX Products 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 @@ -33,8 +33,6 @@ BuildRequires: log4j BuildRequires: xerces-j2 BuildRequires: xerces-j2-xml-apis BuildRequires: xml-commons-apis -Requires: ant >= 1.6 -Requires: javapackages-tools Requires: log4j Requires: xerces-j2 Requires: xml-commons-apis @@ -71,11 +69,10 @@ done %build perl -p -i -e 's|classic|modern|' src/build.xml -#export CLASSPATH=$(build-classpath js log4j xerces-j2 xml-commons-apis) export CLASSPATH=$(build-classpath xml-commons-apis log4j xerces-j2 xerces-j2-xml-apis) -ant -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -buildfile src/build.xml jar javadoc +ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -buildfile src/build.xml jar javadoc CLASSPATH=$CLASSPATH:dist/adaptx_%{version}.jar -ant -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -buildfile src/build.xml doc +ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -buildfile src/build.xml doc %install # jar