From 85442e5588306c6437a1f1fe9ca434bbad3c3c90 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sep 09 2020 21:39:02 +0000 Subject: disable unused log4j12 module --- diff --git a/slf4j.spec b/slf4j.spec index feaf584..30a37c2 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -30,7 +30,7 @@ Name: slf4j Version: 1.7.30 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 0 Summary: Simple Logging Facade for Java # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT @@ -44,12 +44,14 @@ BuildRequires: maven-local BuildRequires: mvn(ch.qos.cal10n:cal10n-api) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(javassist:javassist) -BuildRequires: mvn(log4j:log4j:1.2.17) BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +# -log4j12 subpackage removed in fedora 34 +Obsoletes: slf4j-log4j12 < 0:1.7.30-7 + %description The Simple Logging Facade for Java or (SLF4J) is intended to serve as a simple facade for various logging APIs allowing to the end-user @@ -80,12 +82,6 @@ Summary: SLF4J JDK14 Binding %description jdk14 SLF4J JDK14 Binding. -%package log4j12 -Summary: SLF4J LOG4J-12 Binding - -%description log4j12 -SLF4J LOG4J-12 Binding. - %package jcl Summary: SLF4J JCL Binding @@ -130,6 +126,7 @@ cp -p %{SOURCE1} APACHE-LICENSE %pom_disable_module integration %pom_disable_module osgi-over-slf4j %pom_disable_module slf4j-android +%pom_disable_module slf4j-log4j12 %pom_disable_module slf4j-migrator # Because of a non-ASCII comment in slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java @@ -202,7 +199,6 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual %license LICENSE.txt APACHE-LICENSE %files jdk14 -f .mfiles-%{name}-jdk14 -%files log4j12 -f .mfiles-%{name}-log4j12 %files jcl -f .mfiles-%{name}-jcl %files ext -f .mfiles-%{name}-ext %files -n jcl-over-slf4j -f .mfiles-jcl-over-slf4j @@ -220,6 +216,9 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual %{_defaultdocdir}/%{name}-manual %changelog +* Wed Sep 09 2020 Fabio Valentini - 0:1.7.30-7 +- Disable unused log4j12 module. + * Thu Jul 30 2020 Fabio Valentini - 0:1.7.30-6 - Port to commons-lang3.