From 085a7f9f5d5b2daa282f98503f9dcb644d420fb0 Mon Sep 17 00:00:00 2001 From: wangzhe Date: Thu, 14 Mar 2024 13:01:46 +0800 Subject: [PATCH 1/2] spec: Add Requires java-11-headless Signed-off-by: wangzhe --- log4j.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/log4j.spec b/log4j.spec index 9e7c320..1b7ac50 100644 --- a/log4j.spec +++ b/log4j.spec @@ -2,7 +2,7 @@ Name: log4j Version: 2.17.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java logging package BuildArch: noarch License: ASL 2.0 @@ -13,7 +13,7 @@ URL: https://logging.apache.org/%{name} Source0: %{name}-%{version}.tar.gz Patch2: logging-log4j-Remove-unsupported-EventDataConverter.patch - +Requires: (java-headless or java-11-headless) BuildRequires: maven-local BuildRequires: mvn(com.lmax:disruptor) BuildRequires: mvn(com.sun.activation:jakarta.activation) @@ -76,18 +76,21 @@ variety of output targets. %package slf4j Summary: Binding between LOG4J 2 API and SLF4J +Requires: (java-headless or java-11-headless) %description slf4j Binding between LOG4J 2 API and SLF4J. %package jcl Summary: Apache Log4j Commons Logging Bridge +Requires: (java-headless or java-11-headless) %description jcl Apache Log4j Commons Logging Bridge. %package web Summary: Apache Log4j Web +Requires: (java-headless or java-11-headless) %description web Support for Log4j in a web servlet container. @@ -289,6 +292,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %changelog +* Wed Mar 13 2024 wangzhe - 2.17.2-2 +- Add Requires java-11-headless + * Thu Oct 20 2022 Marián Konček - 2.17.2-1 - Update to upstream version 2.17.2 - Re-add log4j-web subpackage -- Gitee From 27bd9cc0605baecc9a090c8c8f818750ed372b42 Mon Sep 17 00:00:00 2001 From: wangzhe Date: Thu, 14 Mar 2024 14:30:01 +0800 Subject: [PATCH 2/2] spec: disable AutoReqProv Signed-off-by: wangzhe --- log4j.spec | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/log4j.spec b/log4j.spec index 1b7ac50..87efba5 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,4 +1,5 @@ %bcond_without jp_minimal +AutoReqProv: no Name: log4j Version: 2.17.2 @@ -14,6 +15,33 @@ Source0: %{name}-%{version}.tar.gz Patch2: logging-log4j-Remove-unsupported-EventDataConverter.patch Requires: (java-headless or java-11-headless) +Requires: javapackages-filesystem +Provides: mvn(log4j:log4j) = 2.17.2 +Provides: mvn(log4j:log4j:pom:) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-1.2-api) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-1.2-api:pom:) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-api) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-api-java9:pom:) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-api-java9:zip:) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-api:pom:) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-core) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-core-java9:pom:) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-core-java9:zip:) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-core:pom:) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-jpl) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-jpl:pom:) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-osgi) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-osgi:pom:) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-to-jul) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-to-jul:pom:) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j:pom:) = 2.17.2 +Provides: osgi(org.apache.logging.log4j.1.2-api) = 2.17.2 +Provides: osgi(org.apache.logging.log4j.api) = 2.17.2 +Provides: osgi(org.apache.logging.log4j.core) = 2.17.2 +Provides: osgi(org.apache.logging.log4j.jpl) = 2.17.2 +Provides: osgi(org.apache.logging.log4j.osgi) = 2.17.2 +Provides: osgi(org.apache.logging.log4j.to-jul) = 2.17.2 + BuildRequires: maven-local BuildRequires: mvn(com.lmax:disruptor) BuildRequires: mvn(com.sun.activation:jakarta.activation) @@ -76,21 +104,46 @@ variety of output targets. %package slf4j Summary: Binding between LOG4J 2 API and SLF4J +AutoReqProv: no Requires: (java-headless or java-11-headless) +Requires: javapackages-filesystem +Requires: mvn(org.apache.logging.log4j:log4j-api) = 2.17.2 +Requires: mvn(org.apache.logging.log4j:log4j-core) = 2.17.2 +Requires: mvn(org.slf4j:slf4j-api) +Provides: mvn(org.apache.logging.log4j:log4j-slf4j-impl) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-slf4j-impl:pom:) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-to-slf4j) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-to-slf4j:pom:) = 2.17.2 +Provides: osgi(org.apache.logging.log4j.slf4j-impl) = 2.17.2 +Provides: osgi(org.apache.logging.log4j.to-slf4j) = 2.17.2 %description slf4j Binding between LOG4J 2 API and SLF4J. %package jcl Summary: Apache Log4j Commons Logging Bridge +AutoReqProv: no Requires: (java-headless or java-11-headless) +Requires: javapackages-filesystem +Requires: mvn(commons-logging:commons-logging) +Requires: mvn(org.apache.logging.log4j:log4j-api) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-jcl) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-jcl:pom:) = 2.17.2 +Provides: osgi(org.apache.logging.log4j.jcl) = 2.17.2 %description jcl Apache Log4j Commons Logging Bridge. %package web Summary: Apache Log4j Web +AutoReqProv: no Requires: (java-headless or java-11-headless) +Requires: javapackages-filesystem +Requires: mvn(org.apache.logging.log4j:log4j-api) = 2.17.2 +Requires: mvn(org.apache.logging.log4j:log4j-core) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-web) = 2.17.2 +Provides: mvn(org.apache.logging.log4j:log4j-web:pom:) = 2.17.2 +Provides: osgi(org.apache.logging.log4j.web) = 2.17.2 %description web Support for Log4j in a web servlet container. -- Gitee