From ecdec877f7f036fe9454af3e7ee5f93ac3520763 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 23 Jun 2023 12:28:58 -0500 Subject: [PATCH] Drop pki-servlet-engine dependency The pki-servlet-engine is no longer needed since now Tomcat is available on all platforms. --- pki.spec | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/pki.spec b/pki.spec index 2a61bdccc5e..36b52a084a9 100644 --- a/pki.spec +++ b/pki.spec @@ -173,16 +173,11 @@ BuildRequires: mvn(org.jboss.resteasy:resteasy-client) BuildRequires: mvn(org.jboss.resteasy:resteasy-jackson2-provider) BuildRequires: mvn(org.jboss.resteasy:resteasy-jaxrs) BuildRequires: mvn(org.jboss.resteasy:resteasy-servlet-initializer) +BuildRequires: tomcat >= 1:9.0.31 BuildRequires: jss >= 5.4 BuildRequires: tomcatjss >= 8.4 BuildRequires: ldapjdk >= 5.4 -%if 0%{?rhel} && ! 0%{?eln} -BuildRequires: pki-servlet-engine >= 9.0.31 -%else -BuildRequires: tomcat >= 1:9.0.31 -%endif - # Python build dependencies BuildRequires: python3 >= 3.9 BuildRequires: python3-devel @@ -197,12 +192,6 @@ BuildRequires: python3-sphinx BuildRequires: systemd-units -%if 0%{?rhel} && ! 0%{?eln} -BuildRequires: pki-servlet-engine >= 9.0.31 -%else -BuildRequires: tomcat >= 1:9.0.31 -%endif - # additional build requirements needed to build native 'tpsclient' # REMINDER: Revisit these once 'tpsclient' is rewritten as a Java app BuildRequires: apr-devel @@ -447,11 +436,7 @@ Requires: python3-policycoreutils Requires: selinux-policy-targeted >= 3.13.1-159 Requires: mvn(org.jboss.resteasy:resteasy-servlet-initializer) -%if 0%{?rhel} && ! 0%{?eln} -Requires: pki-servlet-engine >= 9.0.31 -%else Requires: tomcat >= 1:9.0.31 -%endif Requires: systemd Requires(post): systemd-units