From 20067ede195f039fd0864eb0aa8f69801bc03504 Mon Sep 17 00:00:00 2001
From: Matthew Harmsen <mharmsen@redhat.com>
Date: Thu, 9 Jun 2016 21:09:23 -0600
Subject: Updated 'java', 'java-headless', and 'java-devel' dependencies to
 1:1.8.0.

Added temporary build dependency on tomcat (override tomcatjss dependency)
---
 specs/pki-core.spec | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'specs/pki-core.spec')

diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 99eccce05..3e6e974ae 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -64,7 +64,14 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    cmake >= 2.8.9-1
 BuildRequires:    zip
+%if 0%{?rhel}
+# HACK:  RHEL builds currently suppress 'Provides: java-devel' . . .
+BuildRequires:    java-1.8.0-openjdk-devel
+# Add temporary build dependency on tomcat (override tomcatjss dependency)
+BuildRequires:    tomcat >= 7.0.69
+%else
 BuildRequires:    java-devel >= 1:1.8.0
+%endif
 BuildRequires:    redhat-rpm-config
 BuildRequires:    ldapjdk
 BuildRequires:    apache-commons-cli
-- 
cgit