From 79a3d4a4bfd66b4af866da20e2b9d604c5cc1ffa66b41f522c155817e7149c09 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 1 Oct 2019 10:07:01 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/adaptx?expand=0&rev=28 --- adaptx.changes | 5 +++++ adaptx.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/adaptx.changes b/adaptx.changes index b6b9eff..c9533e0 100644 --- a/adaptx.changes +++ b/adaptx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 1 10:06:34 UTC 2019 - Fridrich Strba + +- Build against the new compatibility log4j12-mini package + ------------------------------------------------------------------- Thu Dec 6 15:27:33 UTC 2018 - Fridrich Strba diff --git a/adaptx.spec b/adaptx.spec index ca1ca32..1924ed6 100644 --- a/adaptx.spec +++ b/adaptx.spec @@ -1,7 +1,7 @@ # # spec file for package adaptx # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -30,10 +30,10 @@ Patch1: %{name}-%{version}-icedtea-build.patch BuildRequires: ant >= 1.6 BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools -BuildRequires: log4j +BuildRequires: log4j12 BuildRequires: xerces-j2 BuildRequires: xml-apis -Requires: log4j +Requires: log4j12 Requires: xerces-j2 Requires: xml-apis BuildArch: noarch @@ -68,7 +68,7 @@ done %build perl -p -i -e 's|classic|modern|' src/build.xml -export CLASSPATH=$(build-classpath xml-apis log4j xerces-j2) +export CLASSPATH=$(build-classpath xml-apis log4j12/log4j-12 xerces-j2) ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 -buildfile src/build.xml jar javadoc CLASSPATH=$CLASSPATH:dist/adaptx_%{version}.jar ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 -buildfile src/build.xml doc