[Pki-devel] [PATCH] 574 Fixed problem upgrading to F22.

[Endi Sukma Dewata]

Due to possible Tomcat 7 and 8 conflicts on F22 the spec file has
been modified to explicitly require the proper Tomcat packages for
the platform.

https://fedorahosted.org/pki/ticket/1332

-- 
Endi S. Dewata
-------------- next part --------------
From 1b64d29a66158788908ca8cc0eb9db33af77c06c Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata at redhat.com>
Date: Thu, 16 Apr 2015 12:59:26 -0400
Subject: [PATCH] Fixed problem upgrading to F22.

Due to possible Tomcat 7 and 8 conflicts on F22 the spec file has
been modified to explicitly require the proper Tomcat packages for
the platform.

https://fedorahosted.org/pki/ticket/1332
---
 specs/pki-core.spec | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 6ac4d0180473610171158d3fa3f99e7e3e8da552..5117695a1c5af0c7772f524af692e416c4cd7bf9 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -345,6 +345,15 @@ Obsoletes:        pki-selinux
 Requires:         tomcat >= 7.0.54
 %else
 Requires:         tomcat >= 7.0.47
+%if 0%{?fedora} >= 23
+Requires:         tomcat-el-3.0-api
+Requires:         tomcat-jsp-2.3-api
+Requires:         tomcat-servlet-3.1-api
+%else
+Requires:         tomcat-el-2.2-api
+Requires:         tomcat-jsp-2.2-api
+Requires:         tomcat-servlet-3.0-api
+%endif
 %endif
 
 Requires:         velocity
-- 
1.9.3