Use tomcat instead of pki-servlet-engine in ELN

This commit is contained in:
Endi S. Dewata 2021-03-10 21:38:25 -06:00
parent 2fafceb9b8
commit 63815a4636

View File

@ -13,7 +13,7 @@ License: GPLv2 and LGPLv2
# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
# For official (i.e. supported) releases, use x.y.z-r where r >=1.
Version: 10.10.5
Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
Release: 3%{?_timestamp}%{?_commit_id}%{?dist}
#global _phase -beta1
# To create a tarball from a version tag:
@ -232,7 +232,7 @@ BuildRequires: jna
%endif
BuildRequires: systemd-units
%if 0%{?rhel}
%if 0%{?rhel} && ! 0%{?eln}
BuildRequires: pki-servlet-engine
%else
BuildRequires: tomcat >= 1:9.0.7
@ -505,8 +505,8 @@ Requires: python3-policycoreutils
Requires: selinux-policy-targeted >= 3.13.1-159
%if 0%{?rhel}
Requires: pki-servlet-engine >= 1:9.0.7
%if 0%{?rhel} && ! 0%{?eln}
Requires: pki-servlet-engine
%else
Requires: tomcat >= 1:9.0.7
%endif
@ -1381,6 +1381,9 @@ fi
################################################################################
%changelog
* Wed Mar 10 2021 Dogtag PKI Team <pki-devel@redhat.com> - 10.10.5-3
- Use tomcat instead of pki-servlet-engine in ELN
* Wed Mar 10 2021 Dogtag PKI Team <pki-devel@redhat.com> - 10.10.5-2
- Drop dependency on esc for s390(x) architectures