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

Revert the fix for pki-servlet-engine

Browse Source 
Resolves: RHEL-2330
This commit is contained in:
Chris Kelley 2023-09-13 10:20:01 +01:00
parent ac6abbab56
commit 6af69c8e86
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
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: 12%{?dist} Release: 13%{?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
@ -106,8 +106,7 @@ Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
Requires(postun): systemd Requires(postun): systemd
Provides: pki-servlet-engine Conflicts: pki-servlet-engine <= 1:9.0.50
Obsoletes: pki-servlet-engine
# added after log4j sub-package was removed # added after log4j sub-package was removed
Provides: %{name}-log4j = %{epoch}:%{version}-%{release} Provides: %{name}-log4j = %{epoch}:%{version}-%{release}
@ -169,7 +168,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 Conflicts: pki-servlet-engine <= 1:9.0.50
%description jsp-%{jspspec}-api %description jsp-%{jspspec}-api
Apache Tomcat JSP API Implementation Classes. Apache Tomcat JSP API Implementation Classes.
@ -181,7 +180,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 Conflicts: pki-servlet-engine <= 1:9.0.50
%description lib %description lib
Libraries needed to run the Tomcat Web container. Libraries needed to run the Tomcat Web container.
@ -192,8 +191,7 @@ Provides: servlet = %{servletspec}
Provides: servlet6 Provides: servlet6
Provides: servlet3 Provides: servlet3
Obsoletes: %{name}-servlet-3.1-api Obsoletes: %{name}-servlet-3.1-api
Provides: pki-servlet-4.0-api Conflicts: pki-servlet-4.0-api <= 1:9.0.50
Obsoletes: pki-servlet-4.0-api
%description servlet-%{servletspec}-api %description servlet-%{servletspec}-api
Apache Tomcat Servlet API Implementation Classes. Apache Tomcat Servlet API Implementation Classes.
@ -202,7 +200,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 Conflicts: pki-servlet-engine <= 1:9.0.50 and pki-servlet-container <= 1:9.0.7
%description el-%{elspec}-api %description el-%{elspec}-api
Apache Tomcat EL API Implementation Classes. Apache Tomcat EL API Implementation Classes.
@ -593,6 +591,9 @@ fi
%changelog %changelog
* Thu Sep 07 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-13
- RHEL-2330 Revert the fix for pki-servlet-engine
* Fri Aug 25 2023 Coty Sutherland <csutherl@redhat.com> - 1:9.0.62-12 * Fri Aug 25 2023 Coty Sutherland <csutherl@redhat.com> - 1:9.0.62-12
- Related: #2184135 Declare file conflicts - Related: #2184135 Declare file conflicts