From 22fc5ea3882d59562001d88e9cc768ca4d586fb7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 16:48:36 +0200 Subject: [PATCH] Disable slf4j-ext module --- slf4j.spec | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/slf4j.spec b/slf4j.spec index fa185f2..a318dff 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -30,7 +30,7 @@ Name: slf4j Version: 1.7.26 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Logging Facade for Java # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT License: MIT and ASL 2.0 @@ -40,10 +40,7 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(ch.qos.cal10n:cal10n-api) -BuildRequires: mvn(commons-lang:commons-lang) BuildRequires: mvn(commons-logging:commons-logging) -BuildRequires: mvn(javassist:javassist) BuildRequires: mvn(log4j:log4j:1.2.17) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) @@ -91,12 +88,6 @@ Summary: SLF4J JCL Binding %description jcl SLF4J JCL Binding. -%package ext -Summary: SLF4J Extensions Module - -%description ext -Extensions to the SLF4J API. - %package -n jcl-over-slf4j Summary: JCL 1.1.1 implemented over SLF4J @@ -129,6 +120,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-ext %pom_disable_module slf4j-migrator # Because of a non-ASCII comment in slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java @@ -195,7 +187,6 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual %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 %files -n log4j-over-slf4j -f .mfiles-log4j-over-slf4j %files -n jul-to-slf4j -f .mfiles-jul-to-slf4j @@ -211,6 +202,9 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual %{_defaultdocdir}/%{name}-manual %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.7.26-2 +- Disable slf4j-ext module + * Wed Feb 27 2019 Marian Koncek - 0:1.7.26-1 - Update to upstream version 1.7.26 - Fixes: RHBZ #1678877