Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

https://issues.redhat.com/browse/RHCS-4506 #4626

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 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, ldapjdk < 5.0
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,8 +422,8 @@ 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: jss >= 4.9.6, jss < 5.0
Requires: ldapjdk >= 4.23, ldapjdk < 5.0
Requires: %{product_id}-base = %{version}-%{release}

%if 0%{?rhel} && 0%{?rhel} <= 8
Expand Down Expand Up @@ -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, idm-console-framework < 2.0

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

Expand Down
Loading