diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2016-06-09 21:09:23 -0600 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2016-06-09 21:09:23 -0600 |
| commit | 20067ede195f039fd0864eb0aa8f69801bc03504 (patch) | |
| tree | 4e65b53438bad191bb51590ecd82e37fbb9455d4 /specs | |
| parent | a2b06f7328bdc0bff832bf8ecc80c5068d1735f6 (diff) | |
| download | pki-20067ede195f039fd0864eb0aa8f69801bc03504.tar.gz pki-20067ede195f039fd0864eb0aa8f69801bc03504.tar.xz pki-20067ede195f039fd0864eb0aa8f69801bc03504.zip | |
Updated 'java', 'java-headless', and 'java-devel' dependencies to 1:1.8.0.
Added temporary build dependency on tomcat (override tomcatjss dependency)
Diffstat (limited to 'specs')
| -rw-r--r-- | specs/dogtag-pki-theme.spec | 5 | ||||
| -rw-r--r-- | specs/pki-console.spec | 5 | ||||
| -rw-r--r-- | specs/pki-core.spec | 7 |
3 files changed, 17 insertions, 0 deletions
diff --git a/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec index 37c0a55e9..0c0a0b202 100644 --- a/specs/dogtag-pki-theme.spec +++ b/specs/dogtag-pki-theme.spec @@ -11,7 +11,12 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake +%if 0%{?rhel} +# HACK: RHEL builds currently suppress 'Provides: java-devel' . . . +BuildRequires: java-1.8.0-openjdk-devel +%else BuildRequires: java-devel >= 1:1.8.0 +%endif BuildRequires: jpackage-utils >= 1.7.5-10 %if 0%{?rhel} diff --git a/specs/pki-console.spec b/specs/pki-console.spec index 29768b9e5..5d939ba91 100644 --- a/specs/pki-console.spec +++ b/specs/pki-console.spec @@ -14,7 +14,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake >= 2.8.9-1 BuildRequires: idm-console-framework +%if 0%{?rhel} +# HACK: RHEL builds currently suppress 'Provides: java-devel' . . . +BuildRequires: java-1.8.0-openjdk-devel +%else BuildRequires: java-devel >= 1:1.8.0 +%endif BuildRequires: ldapjdk BuildRequires: nspr-devel BuildRequires: nss-devel 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 |