From 51efc6f6498df9328dcfab67be20ee6247e336b5 Mon Sep 17 00:00:00 2001
From: Merlin Mathesius <mmathesi@redhat.com>
Date: Dec 10 2020 19:04:59 +0000
Subject: Minor conditional updates to SPEC so package will build for ELN, which has

tomcat rather than pki-servlet-engine

Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>

---

diff --git a/tomcatjss.spec b/tomcatjss.spec
index dc618b0..f07ff38 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -8,7 +8,7 @@ License:          LGPLv2+
 BuildArch:        noarch
 
 Version:          7.6.0
-Release:          2%{?_timestamp}%{?_commit_id}%{?dist}
+Release:          3%{?_timestamp}%{?_commit_id}%{?dist}
 #global           _phase -a1
 
 # To generate the source tarball:
@@ -70,7 +70,7 @@ BuildRequires:    tomcat >= 8.0.49
 %if 0%{?fedora} && 0%{?fedora} <= 28
 BuildRequires:    tomcat >= 1:8.5.23
 %else
-%if 0%{?rhel}
+%if 0%{?rhel} && ! 0%{?eln}
 BuildRequires:    pki-servlet-engine >= 1:9.0.7
 %else
 BuildRequires:    tomcat >= 1:9.0.7
@@ -117,7 +117,7 @@ Requires:         tomcat >= 8.0.49
 %if 0%{?fedora} && 0%{?fedora} <= 28
 Requires:         tomcat >= 1:8.5.23
 %else
-%if 0%{?rhel}
+%if 0%{?rhel} && ! 0%{?eln}
 Requires:         pki-servlet-engine >= 1:9.0.7
 %else
 Requires:         tomcat >= 1:9.0.7
@@ -181,6 +181,9 @@ ant -f build.xml \
 
 ################################################################################
 %changelog
+* Thu Dec 10 2020 Merlin Mathesius <mmathesi@redhat.com> - 7.6.0-3
+- Minor conditional updates to SPEC so package will build for ELN
+
 * Thu Nov 05 2020 Dogtag PKI Team <pki-devel@redhat.com> - 7.6.0-2
 - Conflict with older PKI versions due to ACL3