Replace pki-servlet-engine with tomcat
Resolves: https://issues.redhat.com/browse/RHEL-30063
This commit is contained in:
parent
0e8efdf7e6
commit
4752b6b4d6
@ -12,7 +12,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.
|
||||
%global release_number 1
|
||||
%global release_number 2
|
||||
Version: 10.14.3
|
||||
Release: %{?release_number}%{?_timestamp}%{?_commit_id}%{?dist}
|
||||
#global _phase
|
||||
@ -210,6 +210,8 @@ BuildRequires: python3-libselinux
|
||||
BuildRequires: python3-requests >= 2.6.0
|
||||
BuildRequires: python3-six
|
||||
|
||||
BuildRequires: tomcat
|
||||
|
||||
BuildRequires: junit
|
||||
BuildRequires: jpackage-utils >= 0:1.7.5-10
|
||||
BuildRequires: jss >= 4.9.0, jss < 5.0.0
|
||||
@ -217,12 +219,6 @@ BuildRequires: tomcatjss >= 7.7.0, tomcatjss < 8.0.0
|
||||
|
||||
BuildRequires: systemd-units
|
||||
|
||||
%if 0%{?rhel} && ! 0%{?eln}
|
||||
BuildRequires: pki-servlet-engine
|
||||
%else
|
||||
BuildRequires: tomcat >= 1:9.0.7
|
||||
%endif
|
||||
|
||||
# additional build requirements needed to build native 'tpsclient'
|
||||
# REMINDER: Revisit these once 'tpsclient' is rewritten as a Java app
|
||||
BuildRequires: apr-devel
|
||||
@ -507,11 +503,7 @@ Requires: python3-policycoreutils
|
||||
|
||||
Requires: selinux-policy-targeted >= 3.13.1-159
|
||||
|
||||
%if 0%{?rhel} && ! 0%{?eln}
|
||||
Requires: pki-servlet-engine
|
||||
%else
|
||||
Requires: tomcat >= 1:9.0.7
|
||||
%endif
|
||||
Requires: tomcat
|
||||
|
||||
Requires: sudo
|
||||
Requires: systemd
|
||||
@ -1403,6 +1395,9 @@ fi
|
||||
|
||||
################################################################################
|
||||
%changelog
|
||||
* Thu Mar 21 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 10.14.3-2
|
||||
- RHEL-30063: Replace pki-servlet-engine with tomcat
|
||||
|
||||
* Fri Feb 03 2023 Red Hat PKI Team <rhcs-maint@redhat.com> 10.14.3-1
|
||||
- Rebase to PKI 10.14.3
|
||||
- Bug 1959057 - An error has ocorred (IPA Error 4301:CertificateOperationError)
|
||||
|
Loading…
Reference in New Issue
Block a user