From 6af69c8e86f4682e01377fcd060a2c028a728462 Mon Sep 17 00:00:00 2001
From: Chris Kelley <ckelley@redhat.com>
Date: Wed, 13 Sep 2023 10:20:01 +0100
Subject: [PATCH] Revert the fix for pki-servlet-engine

Resolves: RHEL-2330
---
 tomcat.spec | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tomcat.spec b/tomcat.spec
index e34211d..0575c80 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -56,7 +56,7 @@
 Name:          tomcat
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       12%{?dist}
+Release:       13%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       ASL 2.0
@@ -106,8 +106,7 @@ Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
 
-Provides:  pki-servlet-engine
-Obsoletes: pki-servlet-engine
+Conflicts: pki-servlet-engine <= 1:9.0.50
 
 # added after log4j sub-package was removed
 Provides:         %{name}-log4j = %{epoch}:%{version}-%{release}
@@ -169,7 +168,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
+Conflicts: pki-servlet-engine <= 1:9.0.50
 
 %description jsp-%{jspspec}-api
 Apache Tomcat JSP API Implementation Classes.
@@ -181,7 +180,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
+Conflicts: pki-servlet-engine <= 1:9.0.50
 
 %description lib
 Libraries needed to run the Tomcat Web container.
@@ -192,8 +191,7 @@ Provides: servlet = %{servletspec}
 Provides: servlet6
 Provides: servlet3
 Obsoletes: %{name}-servlet-3.1-api
-Provides:  pki-servlet-4.0-api
-Obsoletes: pki-servlet-4.0-api
+Conflicts: pki-servlet-4.0-api <= 1:9.0.50
 
 %description servlet-%{servletspec}-api
 Apache Tomcat Servlet API Implementation Classes.
@@ -202,7 +200,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
+Conflicts: pki-servlet-engine <= 1:9.0.50 and pki-servlet-container <= 1:9.0.7
 
 %description el-%{elspec}-api
 Apache Tomcat EL API Implementation Classes.
@@ -593,6 +591,9 @@ fi
 
 
 %changelog
+* Thu Sep 07 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-13
+- RHEL-2330 Revert the fix for pki-servlet-engine
+
 * Fri Aug 25 2023 Coty Sutherland <csutherl@redhat.com> - 1:9.0.62-12
 - Related: #2184135 Declare file conflicts