From 43afed0ec8d00479cffd7543ab5137dd4f6656e67671ea2226deedf90f8b01a5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 1 Oct 2019 09:03:41 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/slf4j?expand=0&rev=45 --- slf4j-sources.changes | 7 +++++++ slf4j-sources.spec | 2 +- slf4j.changes | 7 +++++++ slf4j.spec | 4 ++-- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/slf4j-sources.changes b/slf4j-sources.changes index c572839..f614862 100644 --- a/slf4j-sources.changes +++ b/slf4j-sources.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Oct 1 09:01:32 UTC 2019 - Fridrich Strba + +- Build against the compatibility log4j12-mini package +- Depend on mvn(log4j:log4j:1.2.17) provided by the compatibility + packages + ------------------------------------------------------------------- Tue Mar 19 05:31:47 UTC 2019 - Fridrich Strba diff --git a/slf4j-sources.spec b/slf4j-sources.spec index 9f91411..e84472d 100644 --- a/slf4j-sources.spec +++ b/slf4j-sources.spec @@ -35,7 +35,7 @@ BuildRequires: xmvn-install BuildRequires: xmvn-resolve BuildArch: noarch Requires: mvn(commons-logging:commons-logging) -Requires: mvn(log4j:log4j) +Requires: mvn(log4j:log4j:1.2.17) Requires: mvn(org.slf4j:slf4j-api) = %{version} %description diff --git a/slf4j.changes b/slf4j.changes index c572839..f614862 100644 --- a/slf4j.changes +++ b/slf4j.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Oct 1 09:01:32 UTC 2019 - Fridrich Strba + +- Build against the compatibility log4j12-mini package +- Depend on mvn(log4j:log4j:1.2.17) provided by the compatibility + packages + ------------------------------------------------------------------- Tue Mar 19 05:31:47 UTC 2019 - Fridrich Strba diff --git a/slf4j.spec b/slf4j.spec index 4577c78..466fed0 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -41,7 +41,7 @@ BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: javassist >= 3.4 BuildRequires: junit >= 3.8.2 -BuildRequires: log4j-mini +BuildRequires: log4j112-mini Requires: cal10n Requires: java # this is ugly hack, which creates package which requires the same, @@ -164,7 +164,7 @@ done sed -i "/Import-Package/s/.$/;resolution:=optional&/" slf4j-api/src/main/resources/META-INF/MANIFEST.MF %build -export CLASSPATH=$(build-classpath log4j \ +export CLASSPATH=$(build-classpath log4j12/log4j-12 \ commons-logging \ commons-lang3 \ javassist-3.14.0 \