diff --git a/tomcat.spec b/tomcat.spec index 96c8fb3..b36ba92 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -53,7 +53,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: Apache-2.0 @@ -134,12 +134,12 @@ The docs web application for Apache Tomcat. Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes Provides: jsp = %{jspspec} Obsoletes: %{name}-jsp-api < %{jspspec} +Obsoletes: %{name}-jsp-2.3-api < %{version} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Conflicts: tomcat9 Conflicts: tomcat9-jsp-2.3-api - %description jsp-%{jspspec}-api Apache Tomcat JSP API Implementation Classes. @@ -164,6 +164,7 @@ Libraries needed to run the Tomcat Web container. Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes Provides: servlet = %{servletspec} Obsoletes: %{name}-servlet-api < %{servletspec} +Obsoletes: %{name}-servlet-4.0-api < %{version} Conflicts: tomcat9 Conflicts: tomcat9-servlet-4.0-api @@ -174,6 +175,7 @@ Apache Tomcat Servlet API Implementation Classes. Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Provides: el_api = %{elspec} Obsoletes: %{name}-el-api < %{elspec} +Obsoletes: %{name}-el-3.0-api < %{version} Conflicts: tomcat9 Conflicts: tomcat9-el-3.0-api @@ -532,6 +534,9 @@ exit 0 %{appdir}/ROOT %changelog +* Tue Feb 11 2025 Adam Krajcik - 1:10.1.8-2 +- Resolves: RHEL-78899 Add missing Obsoletes + * Wed Feb 05 2025 Adam Krajcik - 1:10.1.8-1 - Resolves: RHEL-51222 Upgrade tomcat to 10.1.8