Skip to content

Commit

Permalink
Drop pki-servlet-engine dependency
Browse files Browse the repository at this point in the history
The pki-servlet-engine is no longer needed since now Tomcat
is available on all platforms.
  • Loading branch information
edewata committed Jun 23, 2023
1 parent 21b290e commit 06a3059
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions pki.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 06a3059

Please sign in to comment.