Skip to content

Commit

Permalink
https://issues.redhat.com/browse/RHCS-4506
Browse files Browse the repository at this point in the history
This patch attempts to fix the dependency issues in the spec file.

fixes https://issues.redhat.com/browse/RHCS-4506
  • Loading branch information
Christina Fu committed Nov 28, 2023
1 parent 838d690 commit fb9298d
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions pki.spec
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ BuildRequires: zip
BuildRequires: %{java_devel}
BuildRequires: javapackages-tools
BuildRequires: redhat-rpm-config
BuildRequires: ldapjdk = 4.23
BuildRequires: ldapjdk >= 4.23
BuildRequires: apache-commons-cli
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-io
Expand Down Expand Up @@ -207,8 +207,8 @@ BuildRequires: python3-six

BuildRequires: junit
BuildRequires: jpackage-utils >= 0:1.7.5-10
BuildRequires: jss = 4.9
BuildRequires: tomcatjss = 7.7
BuildRequires: jss >= 4.9.6, jss < 5.0
BuildRequires: tomcatjss >= 7.7.3, tomcatjss < 8.0

BuildRequires: systemd-units

Expand Down Expand Up @@ -334,7 +334,7 @@ Provides: pki-symkey = %{version}-%{release}

Requires: %{java_headless}
Requires: jpackage-utils >= 0:1.7.5-10
Requires: jss = 4.9
Requires: jss >= 4.9.6, jss < 5.0
Requires: nss >= 3.38.0

# Ensure we end up with a useful installation
Expand Down Expand Up @@ -422,9 +422,9 @@ Requires: glassfish-jaxb-api
Requires: slf4j
Requires: slf4j-jdk14
Requires: jpackage-utils >= 0:1.7.5-10
Requires: jss = 4.9
Requires: ldapjdk = 4.23
Requires: %{product_id}-base = %{version}-%{release}
Requires: jss >= 4.9.6, jss < 5.0
Requires: ldapjdk >= 4.23
Requires: %{product_id}-base >= %{version}-%{release}

%if 0%{?rhel} && 0%{?rhel} <= 8
Requires: resteasy >= 3.0.26
Expand Down Expand Up @@ -459,7 +459,7 @@ Provides: pki-tools = %{version}-%{release}

Requires: openldap-clients
Requires: nss-tools >= 3.36.1
Requires: %{product_id}-base-java = %{version}-%{release}
Requires: %{product_id}-base-java >= %{version}-%{release}
Requires: p11-kit-trust

# PKICertImport depends on certutil and openssl
Expand Down Expand Up @@ -490,8 +490,8 @@ Requires: policycoreutils
Requires: procps-ng
Requires: openldap-clients
Requires: openssl
Requires: %{product_id}-symkey = %{version}-%{release}
Requires: %{product_id}-tools = %{version}-%{release}
Requires: %{product_id}-symkey >= %{version}-%{release}
Requires: %{product_id}-tools >= %{version}-%{release}

Requires: keyutils

Expand All @@ -515,7 +515,7 @@ Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
Requires(pre): shadow-utils
Requires: tomcatjss = 7.7
Requires: tomcatjss >= 7.7.3, tomcatjss < 8.0

# pki-healthcheck depends on the following library
%if 0%{?rhel}
Expand Down Expand Up @@ -800,9 +800,9 @@ BuildArch: noarch
Obsoletes: pki-console < %{version}-%{release}
Provides: pki-console = %{version}-%{release}

BuildRequires: idm-console-framework = 1.3
BuildRequires: idm-console-framework >= 1.3

Requires: idm-console-framework = 1.3
Requires: idm-console-framework >= 1.3
Requires: %{product_id}-base-java = %{version}-%{release}
Requires: %{product_id}-console-theme = %{version}-%{release}

Expand Down

0 comments on commit fb9298d

Please sign in to comment.