rpms/tomcat
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Related: #2184135 Declare file conflicts

Browse Source
This commit is contained in:
Coty Sutherland 2023-08-25 15:14:36 -04:00
parent 34af9b015d
commit ac6abbab56
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tomcat.spec
View File

@ -56,7 +56,7 @@
Name: tomcat Name: tomcat
Epoch: 1 Epoch: 1
Version: %{major_version}.%{minor_version}.%{micro_version} Version: %{major_version}.%{minor_version}.%{micro_version}
Release: 11%{?dist} Release: 12%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
License: ASL 2.0 License: ASL 2.0
@ -169,6 +169,7 @@ Provides: jsp = %{jspspec}
Obsoletes: %{name}-jsp-2.2-api Obsoletes: %{name}-jsp-2.2-api
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
Obsoletes: pki-servlet-engine
%description jsp-%{jspspec}-api %description jsp-%{jspspec}-api
Apache Tomcat JSP API Implementation Classes. Apache Tomcat JSP API Implementation Classes.
@ -180,6 +181,7 @@ Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
Requires: ecj >= 1:4.10 Requires: ecj >= 1:4.10
Requires(preun): coreutils Requires(preun): coreutils
Obsoletes: pki-servlet-engine
%description lib %description lib
Libraries needed to run the Tomcat Web container. Libraries needed to run the Tomcat Web container.
@ -200,6 +202,7 @@ Apache Tomcat Servlet API Implementation Classes.
Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes
Provides: el_api = %{elspec} Provides: el_api = %{elspec}
Obsoletes: %{name}-el-2.2-api Obsoletes: %{name}-el-2.2-api
Obsoletes: pki-servlet-engine
%description el-%{elspec}-api %description el-%{elspec}-api
Apache Tomcat EL API Implementation Classes. Apache Tomcat EL API Implementation Classes.
@ -590,6 +593,9 @@ fi
%changelog %changelog
* Fri Aug 25 2023 Coty Sutherland <csutherl@redhat.com> - 1:9.0.62-12
- Related: #2184135 Declare file conflicts
* Fri Aug 25 2023 Coty Sutherland <csutherl@redhat.com> - 1:9.0.62-11 * Fri Aug 25 2023 Coty Sutherland <csutherl@redhat.com> - 1:9.0.62-11
- Resolves: #2184135 Fix bug introduced in initial commit - Resolves: #2184135 Fix bug introduced in initial commit