From 02eb8f78a86337a317f03edcf838b06f6392a850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=C3=A1n=20Kon=C4=8Dek?= Date: Thu, 20 Oct 2022 11:44:52 +0200 Subject: [PATCH] Re-add log4j-web subpackage Resolves: rhbz#2136432 --- log4j.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/log4j.spec b/log4j.spec index 51180ea..7de0bb2 100644 --- a/log4j.spec +++ b/log4j.spec @@ -19,6 +19,7 @@ BuildRequires: mvn(com.lmax:disruptor) BuildRequires: mvn(com.sun.activation:jakarta.activation) BuildRequires: mvn(com.sun.mail:javax.mail) BuildRequires: mvn(commons-logging:commons-logging) +BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) @@ -40,7 +41,6 @@ BuildRequires: mvn(com.fasterxml.woodstox:woodstox-core) BuildRequires: mvn(com.lmax:disruptor) BuildRequires: mvn(com.sun.mail:javax.mail) BuildRequires: mvn(jakarta.servlet:jakarta.servlet-api) -BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(javax.servlet.jsp:jsp-api) BuildRequires: mvn(org.apache.commons:commons-csv) BuildRequires: mvn(org.apache.logging:logging-parent:pom:) @@ -86,6 +86,12 @@ Summary: Apache Log4j Commons Logging Bridge %description jcl Apache Log4j Commons Logging Bridge. +%package web +Summary: Apache Log4j Web + +%description web +Support for Log4j in a web servlet container. + %if %{without jp_minimal} %package osgi Summary: Apache Log4J Core OSGi Bundles @@ -107,12 +113,6 @@ Requires: java-devel Swing-based client for remotely editing the log4j configuration and remotely monitoring StatusLogger output. Includes a JConsole plug-in. -%package web -Summary: Apache Log4j Web - -%description web -Support for Log4j in a web servlet container. - %package bom Summary: Apache Log4j BOM @@ -207,7 +207,6 @@ rm -r log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka %pom_disable_module %{name}-taglib %pom_disable_module %{name}-jmx-gui %pom_disable_module %{name}-bom -%pom_disable_module %{name}-web %pom_disable_module %{name}-jakarta-web %pom_disable_module %{name}-iostreams %pom_disable_module %{name}-jul @@ -277,9 +276,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %files slf4j -f .mfiles-slf4j %files jcl -f .mfiles-jcl +%files web -f .mfiles-web %if %{without jp_minimal} %files taglib -f .mfiles-taglib -%files web -f .mfiles-web %files bom -f .mfiles-bom %files nosql -f .mfiles-nosql %files jmx-gui -f .mfiles-jmx-gui @@ -291,8 +290,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog -* Tue Oct 18 2022 Marián Konček - 2.17.2-1 +* Thu Oct 20 2022 Marián Konček - 2.17.2-1 - Update to upstream version 2.17.2 +- Re-add log4j-web subpackage * Tue Oct 18 2022 Marián Konček - 2.17.1-4 - Remove glyphicons resources from source package