From fa5b6f5fdead65dbf67bea5eced5d85d27720a36 Mon Sep 17 00:00:00 2001
From: Alexander Scheel <ascheel@redhat.com>
Date: Thu, 5 Nov 2020 10:31:24 -0500
Subject: [PATCH] Conflict with older PKI versions due to ACL3

Signed-off-by: Alexander Scheel <ascheel@redhat.com>
---
 tomcatjss.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tomcatjss.spec b/tomcatjss.spec
index 1f24893..dc618b0 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -8,7 +8,7 @@ License:          LGPLv2+
 BuildArch:        noarch
 
 Version:          7.6.0
-Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
+Release:          2%{?_timestamp}%{?_commit_id}%{?dist}
 #global           _phase -a1
 
 # To generate the source tarball:
@@ -127,7 +127,7 @@ Requires:         tomcat >= 1:9.0.7
 %endif
 
 # PKI
-Conflicts:        pki-base < 10.6.5
+Conflicts:        pki-base < 10.10.0
 
 
 %if 0%{?rhel}
@@ -181,6 +181,9 @@ ant -f build.xml \
 
 ################################################################################
 %changelog
+* Thu Nov 05 2020 Dogtag PKI Team <pki-devel@redhat.com> - 7.6.0-2
+- Conflict with older PKI versions due to ACL3
+
 * Wed Oct 21 2020 Dogtag PKI Team <pki-devel@redhat.com> - 7.6.0-1
 - Rebase to match latest upstream stable version v7.6.0