From 1904c20b2f69d597cda386859257077803346cb0 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 28 2023 11:53:49 +0000
Subject: import log4j-2.17.2-1.module+el8.8.0+16992+4f38aa72


---

diff --git a/.gitignore b/.gitignore
index f73a173..8df1d29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/apache-log4j-2.17.1-src.tar.gz
+SOURCES/log4j-2.17.2.tar.gz
diff --git a/.log4j.metadata b/.log4j.metadata
index b2eea1c..df14c28 100644
--- a/.log4j.metadata
+++ b/.log4j.metadata
@@ -1 +1 @@
-62dedc4aa4af93cb064febcc4e5a96f93fdcb7fe SOURCES/apache-log4j-2.17.1-src.tar.gz
+9e778b8991a3719661d5660a1964c0ec5c5eeace SOURCES/log4j-2.17.2.tar.gz
diff --git a/SPECS/log4j.spec b/SPECS/log4j.spec
index d7b6739..9e7c320 100644
--- a/SPECS/log4j.spec
+++ b/SPECS/log4j.spec
@@ -1,14 +1,16 @@
 %bcond_without  jp_minimal
 
 Name:           log4j
-Version:        2.17.1
-Release:        4%{?dist}
+Version:        2.17.2
+Release:        1%{?dist}
 Summary:        Java logging package
 BuildArch:      noarch
 License:        ASL 2.0
 
 URL:            https://logging.apache.org/%{name}
-Source0:        https://www.apache.org/dist/logging/%{name}/%{version}/apache-%{name}-%{version}-src.tar.gz
+
+# ./generate-tarball.sh
+Source0:        %{name}-%{version}.tar.gz
 
 Patch2:         logging-log4j-Remove-unsupported-EventDataConverter.patch
 
@@ -17,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)
@@ -38,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:)
@@ -84,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
@@ -105,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
 
@@ -205,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
@@ -270,14 +271,13 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms
 %endif
 
 %files -f .mfiles
-%dir %{_javadir}/%{name}
 %doc LICENSE.txt NOTICE.txt
 
 %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
@@ -289,6 +289,13 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms
 
 
 %changelog
+* Thu Oct 20 2022 Marián Konček <mkoncek@redhat.com> - 2.17.2-1
+- Update to upstream version 2.17.2
+- Re-add log4j-web subpackage
+
+* Thu Oct 20 2022 Marián Konček <mkoncek@redhat.com> - 2.17.1-5
+- Remove glyphicons resources from source package
+
 * Tue Mar 29 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.17.1-4
 - Fix dependency scope of jakarta-activation