disable unused log4j12 module

This commit is contained in:
Fabio Valentini 2020-09-09 23:39:02 +02:00
parent 06831a1cfd
commit 85442e5588
No known key found for this signature in database
GPG Key ID: 5AC5F572E5D410AF

View File

@ -30,7 +30,7 @@
Name: slf4j Name: slf4j
Version: 1.7.30 Version: 1.7.30
Release: 6%{?dist} Release: 7%{?dist}
Epoch: 0 Epoch: 0
Summary: Simple Logging Facade for Java Summary: Simple Logging Facade for Java
# the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT # 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(ch.qos.cal10n:cal10n-api)
BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(commons-logging:commons-logging)
BuildRequires: mvn(javassist:javassist) BuildRequires: mvn(javassist:javassist)
BuildRequires: mvn(log4j:log4j:1.2.17)
BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-lang3)
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-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 %description
The Simple Logging Facade for Java or (SLF4J) is intended to serve 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 as a simple facade for various logging APIs allowing to the end-user
@ -80,12 +82,6 @@ Summary: SLF4J JDK14 Binding
%description jdk14 %description jdk14
SLF4J JDK14 Binding. SLF4J JDK14 Binding.
%package log4j12
Summary: SLF4J LOG4J-12 Binding
%description log4j12
SLF4J LOG4J-12 Binding.
%package jcl %package jcl
Summary: SLF4J JCL Binding Summary: SLF4J JCL Binding
@ -130,6 +126,7 @@ cp -p %{SOURCE1} APACHE-LICENSE
%pom_disable_module integration %pom_disable_module integration
%pom_disable_module osgi-over-slf4j %pom_disable_module osgi-over-slf4j
%pom_disable_module slf4j-android %pom_disable_module slf4j-android
%pom_disable_module slf4j-log4j12
%pom_disable_module slf4j-migrator %pom_disable_module slf4j-migrator
# Because of a non-ASCII comment in slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java # 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 %license LICENSE.txt APACHE-LICENSE
%files jdk14 -f .mfiles-%{name}-jdk14 %files jdk14 -f .mfiles-%{name}-jdk14
%files log4j12 -f .mfiles-%{name}-log4j12
%files jcl -f .mfiles-%{name}-jcl %files jcl -f .mfiles-%{name}-jcl
%files ext -f .mfiles-%{name}-ext %files ext -f .mfiles-%{name}-ext
%files -n jcl-over-slf4j -f .mfiles-jcl-over-slf4j %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 %{_defaultdocdir}/%{name}-manual
%changelog %changelog
* Wed Sep 09 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.7.30-7
- Disable unused log4j12 module.
* Thu Jul 30 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.7.30-6 * Thu Jul 30 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.7.30-6
- Port to commons-lang3. - Port to commons-lang3.