From ac6abbab5638a9e7ffb8e885c18369a7a9a393ef Mon Sep 17 00:00:00 2001
From: Coty Sutherland <csutherl@redhat.com>
Date: Fri, 25 Aug 2023 15:14:36 -0400
Subject: [PATCH] Related: #2184135 Declare file conflicts

---
 tomcat.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tomcat.spec b/tomcat.spec
index 19dbf58..e34211d 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -56,7 +56,7 @@
 Name:          tomcat
 Epoch:         1
 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
 
 License:       ASL 2.0
@@ -169,6 +169,7 @@ Provides: jsp = %{jspspec}
 Obsoletes: %{name}-jsp-2.2-api
 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
+Obsoletes: pki-servlet-engine
 
 %description jsp-%{jspspec}-api
 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: ecj >= 1:4.10
 Requires(preun): coreutils
+Obsoletes: pki-servlet-engine
 
 %description lib
 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
 Provides: el_api = %{elspec}
 Obsoletes: %{name}-el-2.2-api
+Obsoletes: pki-servlet-engine
 
 %description el-%{elspec}-api
 Apache Tomcat EL API Implementation Classes.
@@ -590,6 +593,9 @@ fi
 
 
 %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
 - Resolves: #2184135 Fix bug introduced in initial commit