diff --git a/.files b/.files index 431ac1b..cefa87a 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 0da6760..665c68a 100644 --- a/.rev +++ b/.rev @@ -171,4 +171,12 @@ Don't require the removed xerces-j2-xml-apis 656911 + + b3fb4d2f96bf0d7aac308ed7a9fb33f6 + 0.9.13 + + dimstar_suse + Automatic submission by obs-autosubmit + 736056 + diff --git a/adaptx.changes b/adaptx.changes index 373d1ef..b043856 100644 --- a/adaptx.changes +++ b/adaptx.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +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 - Don't require the removed xerces-j2-xml-apis, build against a diff --git a/adaptx.spec b/adaptx.spec index c0f4a8b..36d9e4f 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