From c3a902975e70840e281a14e665d73ced6e875284 Mon Sep 17 00:00:00 2001
From: Adam Krajcik <akrajcik@redhat.com>
Date: Fri, 31 Jan 2025 17:35:29 +0100
Subject: [PATCH] Resolves: RHEL-77325 Missing conflicts

---
 tomcat9.spec | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tomcat9.spec b/tomcat9.spec
index e246cfa..4e70fdf 100644
--- a/tomcat9.spec
+++ b/tomcat9.spec
@@ -53,7 +53,7 @@
 Name:          tomcat9
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       Apache-2.0
@@ -135,6 +135,7 @@ Provides: jsp = %{jspspec}
 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
 Conflicts: tomcat
+Conflicts: tomcat-jsp-2.3-api
 Conflicts: tomcat-jsp-3.1-api
 
 %description jsp-%{jspspec}-api
@@ -149,6 +150,12 @@ Requires: ecj >= 1:4.10
 Requires(preun): coreutils
 Conflicts: tomcat
 Conflicts: tomcat-lib
+Conflicts: tomcat-jsp-2.3-api
+Conflicts: tomcat-jsp-3.1-api
+Conflicts: tomcat-servlet-4.0-api
+Conflicts: tomcat-servlet-6.0-api
+Conflicts: tomcat-el-3.0-api
+Conflicts: tomcat-el-5.0-api
 
 %description lib
 Libraries needed to run the Tomcat Web container.
@@ -159,6 +166,7 @@ Provides: servlet = %{servletspec}
 Provides: servlet6
 Provides: servlet3
 Conflicts: tomcat
+Conflicts: tomcat-servlet-4.0-api
 Conflicts: tomcat-servlet-6.0-api
 
 %description servlet-%{servletspec}-api
@@ -167,6 +175,7 @@ Apache Tomcat Servlet API Implementation Classes.
 %package el-%{elspec}-api
 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
 
 %description el-%{elspec}-api
@@ -605,8 +614,10 @@ fi
 %{appdir}/ROOT
 
 %changelog
+* Monday Feb 03 2025 Adam Krajcik <akrajcik@redhat.com> - 1:9.0.87-3
+- Resolves: RHEL-77325 Missing conflicts in spec file
+
 * Fri Jan 24 2025 Adam Krajcik <akrajcik@redhat.com> - 1:9.0.87-2
 - Initial commit on c10s
   Resolves: RHEL-69841
-- Resolves: RHEL-71701
-  tomcat: RCE due to TOCTOU issue in JSP compilation (CVE-2024-50379)
+- tomcat: RCE due to TOCTOU issue in JSP compilation (CVE-2024-50379)