From f2eb7721df91a400dd16d0833b9fbb6536a26f70 Mon Sep 17 00:00:00 2001
From: Hui Wang <huwang@redhat.com>
Date: Fri, 18 Aug 2023 14:53:26 +0800
Subject: [PATCH]  Resolves: #2184135 Add Obsoletes to tomcat package

---
 tomcat.spec | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/tomcat.spec b/tomcat.spec
index 47c7467..7eb74e0 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -56,7 +56,7 @@
 Name:          tomcat
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       8%{?dist}
+Release:       9%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       ASL 2.0
@@ -108,8 +108,8 @@ Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
 
-# We will change it to an obsoletes whenever the pki team is able to make the switch
-Conflicts: pki-servlet-engine <= 1:9.0.50
+Provides:  pki-servlet-engine
+Obsoletes: pki-servlet-engine <= 1:9.0.50
 
 # added after log4j sub-package was removed
 Provides:         %{name}-log4j = %{epoch}:%{version}-%{release}
@@ -171,7 +171,8 @@ 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}
-Conflicts: pki-servlet-engine <= 1:9.0.50
+Provides:  pki-servlet-engine
+Obsoletes: pki-servlet-engine <= 1:9.0.50
 
 %description jsp-%{jspspec}-api
 Apache Tomcat JSP API Implementation Classes.
@@ -183,7 +184,8 @@ Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
 Requires: ecj >= 1:4.10
 Requires(preun): coreutils
-Conflicts: pki-servlet-engine <= 1:9.0.50
+Provides:  pki-servlet-engine
+Obsoletes: pki-servlet-engine <= 1:9.0.50
 
 %description lib
 Libraries needed to run the Tomcat Web container.
@@ -194,7 +196,8 @@ Provides: servlet = %{servletspec}
 Provides: servlet6
 Provides: servlet3
 Obsoletes: %{name}-servlet-3.1-api
-Conflicts: pki-servlet-4.0-api <= 1:9.0.50
+Provides:  pki-servlet-4.0-api
+Obsoletes: pki-servlet-4.0-api <= 1:9.0.50
 
 %description servlet-%{servletspec}-api
 Apache Tomcat Servlet API Implementation Classes.
@@ -203,7 +206,8 @@ 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
-Conflicts: pki-servlet-engine <= 1:9.0.50 and pki-servlet-container <= 1:9.0.7
+Provides:  pki-servlet-engine
+Obsoletes: pki-servlet-engine <= 1:9.0.50
 
 %description el-%{elspec}-api
 Apache Tomcat EL API Implementation Classes.
@@ -595,6 +599,9 @@ fi
 
 
 %changelog
+* Thu Aug 17 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-9
+- Resolves: #2184135 Add Obsoletes to tomcat package
+
 * Thu Aug 17 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-8
 - Resolves: #2189676 Missing Tomcat POM files in RHEL 8.9