From b8a32f4b4b59d2eae3a91a46093ead7c86964399 Mon Sep 17 00:00:00 2001
From: Hui Wang <huwang@redhat.com>
Date: Fri, 3 Feb 2023 23:11:44 +0800
Subject: [PATCH] Related: #2160511 Add conflicts with the pki-servlet-engine
 package

---
 tomcat.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tomcat.spec b/tomcat.spec
index 2f51a9e..6fac492 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -56,7 +56,7 @@
 Name:          tomcat
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       ASL 2.0
@@ -98,7 +98,6 @@ BuildRequires: systemd
 
 Requires:      java-headless >= 1:1.8.0
 Requires:      javapackages-tools
-Requires:      procps
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 %if 0%{?fedora} || 0%{?rhel} > 7
 Recommends:    tomcat-native >= %{native_version}
@@ -108,6 +107,10 @@ 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-4.0-api <= 1:9.0.50
+Conflicts: pki-servlet-engine <= 1:9.0.50
+
 # added after log4j sub-package was removed
 Provides:         %{name}-log4j = %{epoch}:%{version}-%{release}
 
@@ -500,6 +503,9 @@ fi
 
 
 %changelog
+* Fri Feb 03 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-2
+- Add conflicts with the pki-servlet-engine package
+
 * Mon Jan 16 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-1
 - Update to 9.0.62. Related: rhbz#2160511
 - Remove examples webapps from subpackage