Related: #2184133 Declare file conflicts
This commit is contained in:
parent
bc2b50c0ca
commit
83d541ef3a
@ -56,7 +56,7 @@
|
||||
Name: tomcat
|
||||
Epoch: 1
|
||||
Version: %{major_version}.%{minor_version}.%{micro_version}
|
||||
Release: 15%{?dist}
|
||||
Release: 16%{?dist}
|
||||
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
|
||||
|
||||
License: ASL 2.0
|
||||
@ -168,6 +168,7 @@ Provides: jsp = %{jspspec}
|
||||
Obsoletes: %{name}-jsp-2.2-api
|
||||
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: pki-servlet-engine
|
||||
|
||||
%description jsp-%{jspspec}-api
|
||||
Apache Tomcat JSP API Implementation Classes.
|
||||
@ -179,6 +180,7 @@ Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
|
||||
Requires: ecj >= 1:4.10
|
||||
Requires(preun): coreutils
|
||||
Obsoletes: pki-servlet-engine
|
||||
|
||||
%description lib
|
||||
Libraries needed to run the Tomcat Web container.
|
||||
@ -199,6 +201,7 @@ Apache Tomcat Servlet API Implementation Classes.
|
||||
Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes
|
||||
Provides: el_api = %{elspec}
|
||||
Obsoletes: %{name}-el-2.2-api
|
||||
Obsoletes: pki-servlet-engine
|
||||
|
||||
%description el-%{elspec}-api
|
||||
Apache Tomcat EL API Implementation Classes.
|
||||
@ -589,6 +592,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Aug 25 2023 Coty Sutherland <csutherl@redhat.com> - 1:9.0.62-16
|
||||
- Related: #2184133 Declare file conflicts
|
||||
|
||||
* Fri Aug 25 2023 Coty Sutherland <csutherl@redhat.com> - 1:9.0.62-15
|
||||
- Resolves: #2184133 Fix bug in Obsoletes
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user