From a2371313a5b9e2abe0af6d29afcd9d0d3eb4bbe1 Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Mon, 27 Feb 2023 14:48:14 +0800 Subject: [PATCH] Add Obsoletes log4j-nosql for fix upgrade failure --- log4j.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/log4j.spec b/log4j.spec index 0bd44ed..a5a2645 100644 --- a/log4j.spec +++ b/log4j.spec @@ -1,6 +1,6 @@ Name: log4j Version: 2.17.0 -Release: 3 +Release: 4 Summary: Java logging package License: Apache-2.0 URL: http://logging.apache.org/%{name} @@ -18,8 +18,6 @@ BuildRequires: mvn(org.apache.logging:logging-parent:pom:) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.fusesource.jansi:jansi) mvn(org.jctools:jctools-core) BuildRequires: mvn(org.osgi:osgi.core) mvn(org.slf4j:slf4j-api) mvn(org.slf4j:slf4j-ext) -Obsoletes: log4j-mini < %{version}-%{release} -BuildArch: noarch BuildRequires: mvn(com.datastax.cassandra:cassandra-driver-core) BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-xml) BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-yaml) @@ -31,6 +29,9 @@ BuildRequires: mvn(org.eclipse.persistence:javax.persistence) BuildRequires: mvn(org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec) BuildRequires: mvn(org.lightcouch:lightcouch) mvn(org.zeromq:jeromq) mvn(sun.jdk:jconsole) Requires: javapackages-tools +Obsoletes: log4j-mini < %{version}-%{release} +Obsoletes: log4j-nosql < %{version}-%{release} +BuildArch: noarch %description Log4j is a tool to help the programmer output log statements to a variety of output targets. @@ -184,6 +185,9 @@ rm -r log4j-1.2-api/src/main/java/org/apache/log4j/or/jms %doc NOTICE.txt %changelog +* Thu Aug 18 2022 wangkai - 2.17.0-4 +- Add Obsoletes log4j-nosql for fix upgrade failure + * Tue Mar 22 2022 herengui - 2.17.0-3 - rebuild for upgrade