diff --git a/tomcat9.spec b/tomcat9.spec index b9c0d26..ea78660 100644 --- a/tomcat9.spec +++ b/tomcat9.spec @@ -53,7 +53,7 @@ Name: tomcat9 Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: Apache-2.0 @@ -100,6 +100,7 @@ Requires(preun): systemd Requires(postun): systemd Conflicts: tomcat +Obsoletes: tomcat < 1:10.0.0-1 %description Tomcat is the servlet container that is used in the official Reference @@ -116,6 +117,7 @@ Summary: The host-manager and manager web applications for Apache Tomcat Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: tomcat Conflicts: tomcat-admin-webapps +Obsoletes: tomcat-admin-webapps < 1:10.0.0-1 %description admin-webapps The host-manager and manager web applications for Apache Tomcat. @@ -125,6 +127,7 @@ Summary: The docs web application for Apache Tomcat Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: tomcat Conflicts: tomcat-docs-webapp +Obsoletes: tomcat-docs-webapps < 1:10.0.0-1 %description docs-webapp The docs web application for Apache Tomcat. @@ -137,6 +140,7 @@ Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Conflicts: tomcat Conflicts: tomcat-jsp-2.3-api Conflicts: tomcat-jsp-3.1-api +Obsoletes: tomcat-jsp-%{jspspec}-api < 1:10.0.0-1 %description jsp-%{jspspec}-api Apache Tomcat JSP API Implementation Classes. @@ -156,6 +160,7 @@ Conflicts: tomcat-servlet-4.0-api Conflicts: tomcat-servlet-6.0-api Conflicts: tomcat-el-3.0-api Conflicts: tomcat-el-5.0-api +Obsoletes: tomcat-lib < 1:10.0.0-1 %description lib Libraries needed to run the Tomcat Web container. @@ -168,6 +173,7 @@ Provides: servlet3 Conflicts: tomcat Conflicts: tomcat-servlet-4.0-api Conflicts: tomcat-servlet-6.0-api +Obsoletes: tomcat-servlet-%{servletspec}-api < 1:10.0.0-1 %description servlet-%{servletspec}-api Apache Tomcat Servlet API Implementation Classes. @@ -177,6 +183,7 @@ Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes Provides: el_api = %{elspec} Conflicts: tomcat-el-3.0-api Conflicts: tomcat-el-5.0-api +Obsoletes: tomcat-el-%{elspec}-api < 1:10.0.0-1 %description el-%{elspec}-api Apache Tomcat EL API Implementation Classes. @@ -186,6 +193,7 @@ Summary: The ROOT web application for Apache Tomcat Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: tomcat Conflicts: tomcat-webapps +Obsoletes: tomcat-webapps < 1:10.0.0-1 %description webapps The ROOT web application for Apache Tomcat. @@ -614,6 +622,10 @@ fi %{appdir}/ROOT %changelog +* Thu Feb 13 2025 Joe Orton - 1:9.0.87-4 +- add Obsoletes to aid upgrade path from tomcat-9.x + Resolves: RHEL-79313 + * Mon Feb 03 2025 Adam Krajcik - 1:9.0.87-3 - Resolves: RHEL-77325 Missing conflicts in spec file