From bc2b50c0cace17ce8812d945e3a50215e892768e Mon Sep 17 00:00:00 2001
From: Coty Sutherland <csutherl@redhat.com>
Date: Fri, 25 Aug 2023 11:32:25 -0400
Subject: [PATCH] Resolves: #2189675 Fix bug in Obsoletes

---
 tomcat.spec | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/tomcat.spec b/tomcat.spec
index 87b5398..e2482c4 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -56,7 +56,7 @@
 Name:          tomcat
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       14%{?dist}
+Release:       15%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       ASL 2.0
@@ -106,7 +106,7 @@ Requires(preun):  systemd
 Requires(postun): systemd
 
 Provides:  pki-servlet-engine
-Obsoletes: pki-servlet-engine <= 1:9.0.50
+Obsoletes: pki-servlet-engine
 
 # added after log4j sub-package was removed
 Provides:         %{name}-log4j = %{epoch}:%{version}-%{release}
@@ -168,8 +168,6 @@ 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}
-Provides:  pki-servlet-engine
-Obsoletes: pki-servlet-engine <= 1:9.0.50
 
 %description jsp-%{jspspec}-api
 Apache Tomcat JSP API Implementation Classes.
@@ -181,8 +179,6 @@ Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
 Requires: ecj >= 1:4.10
 Requires(preun): coreutils
-Provides:  pki-servlet-engine
-Obsoletes: pki-servlet-engine <= 1:9.0.50
 
 %description lib
 Libraries needed to run the Tomcat Web container.
@@ -194,7 +190,7 @@ Provides: servlet6
 Provides: servlet3
 Obsoletes: %{name}-servlet-3.1-api
 Provides:  pki-servlet-4.0-api
-Obsoletes: pki-servlet-4.0-api <= 1:9.0.50
+Obsoletes: pki-servlet-4.0-api
 
 %description servlet-%{servletspec}-api
 Apache Tomcat Servlet API Implementation Classes.
@@ -203,8 +199,6 @@ 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
-Provides:  pki-servlet-engine
-Obsoletes: pki-servlet-engine <= 1:9.0.50
 
 %description el-%{elspec}-api
 Apache Tomcat EL API Implementation Classes.
@@ -595,6 +589,9 @@ fi
 
 
 %changelog
+* Fri Aug 25 2023 Coty Sutherland <csutherl@redhat.com> - 1:9.0.62-15
+- Resolves: #2184133 Fix bug in Obsoletes
+
 * Mon Aug 01 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-14
 - Resolves: #2210632 CVE-2023-28709 tomcat