From de714ce6c770e7296f12065ce460b5c8cd518f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 11 Jun 2019 11:00:08 +0200 Subject: [PATCH] Drop log4j-taglib, log4j-web, log4j-bom, log4j-nosql and log4j-jmx-gui --- log4j.spec | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/log4j.spec b/log4j.spec index ccfa1b0..9f1defe 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,8 +1,8 @@ -%bcond_with jp_minimal +%bcond_without jp_minimal Name: log4j Version: 2.11.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -71,6 +71,12 @@ Summary: Binding between LOG4J 2 API and SLF4J %description slf4j Binding between LOG4J 2 API and SLF4J. +%package jcl +Summary: Apache Log4j Commons Logging Bridge + +%description jcl +Apache Log4j Commons Logging Bridge. + %if %{without jp_minimal} %package osgi Summary: Apache Log4J Core OSGi Bundles @@ -84,12 +90,6 @@ Summary: Apache Log4j Tag Library %description taglib Apache Log4j Tag Library for Web Applications. -%package jcl -Summary: Apache Log4j Commons Logging Bridge - -%description jcl -Apache Log4j Commons Logging Bridge. - %package jmx-gui Summary: Apache Log4j JMX GUI Requires: java-devel @@ -190,7 +190,6 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_remove_plugin :maven-failsafe-plugin %if %{with jp_minimal} -%pom_disable_module %{name}-jcl %pom_disable_module %{name}-taglib %pom_disable_module %{name}-jmx-gui %pom_disable_module %{name}-bom @@ -252,9 +251,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %doc LICENSE.txt NOTICE.txt %files slf4j -f .mfiles-slf4j +%files jcl -f .mfiles-jcl %if %{without jp_minimal} %files taglib -f .mfiles-taglib -%files jcl -f .mfiles-jcl %files web -f .mfiles-web %files bom -f .mfiles-bom %files nosql -f .mfiles-nosql @@ -267,6 +266,9 @@ rm log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java %changelog +* Tue Jun 11 2019 Miro Hrončok - 2.11.1-4 +- Drop log4j-taglib, log4j-web, log4j-bom, log4j-nosql and log4j-jmx-gui + * Fri Feb 01 2019 Fedora Release Engineering - 2.11.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild