Add Obsoletes log4j-nosql for fix upgrade failure
This commit is contained in:
parent
bf86e96c14
commit
a2371313a5
10
log4j.spec
10
log4j.spec
@ -1,6 +1,6 @@
|
|||||||
Name: log4j
|
Name: log4j
|
||||||
Version: 2.17.0
|
Version: 2.17.0
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: Java logging package
|
Summary: Java logging package
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
URL: http://logging.apache.org/%{name}
|
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.codehaus.mojo:build-helper-maven-plugin)
|
||||||
BuildRequires: mvn(org.fusesource.jansi:jansi) mvn(org.jctools:jctools-core)
|
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)
|
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.datastax.cassandra:cassandra-driver-core)
|
||||||
BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-xml)
|
BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-xml)
|
||||||
BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-yaml)
|
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.jboss.spec.javax.jms:jboss-jms-api_1.1_spec)
|
||||||
BuildRequires: mvn(org.lightcouch:lightcouch) mvn(org.zeromq:jeromq) mvn(sun.jdk:jconsole)
|
BuildRequires: mvn(org.lightcouch:lightcouch) mvn(org.zeromq:jeromq) mvn(sun.jdk:jconsole)
|
||||||
Requires: javapackages-tools
|
Requires: javapackages-tools
|
||||||
|
Obsoletes: log4j-mini < %{version}-%{release}
|
||||||
|
Obsoletes: log4j-nosql < %{version}-%{release}
|
||||||
|
BuildArch: noarch
|
||||||
%description
|
%description
|
||||||
Log4j is a tool to help the programmer output log statements to a
|
Log4j is a tool to help the programmer output log statements to a
|
||||||
variety of output targets.
|
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
|
%doc NOTICE.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 18 2022 wangkai <wangkai385@huawei.com> - 2.17.0-4
|
||||||
|
- Add Obsoletes log4j-nosql for fix upgrade failure
|
||||||
|
|
||||||
* Tue Mar 22 2022 herengui <herengui@uniontech.com> - 2.17.0-3
|
* Tue Mar 22 2022 herengui <herengui@uniontech.com> - 2.17.0-3
|
||||||
- rebuild for upgrade
|
- rebuild for upgrade
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user