diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-06-16 17:23:22 -0500 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-06-17 20:19:09 +0200 |
| commit | fc96c05922d1a42d0fbaaa02a67a31e69c667f84 (patch) | |
| tree | b0a1fd07d733888cbda0480439859e1af752ff17 /specs | |
| parent | 502e9ee5eb52bda8cb5bdf4ac4ef1d32dbded98f (diff) | |
| download | pki-fc96c05922d1a42d0fbaaa02a67a31e69c667f84.tar.gz pki-fc96c05922d1a42d0fbaaa02a67a31e69c667f84.tar.xz pki-fc96c05922d1a42d0fbaaa02a67a31e69c667f84.zip | |
Fixed Java dependency.
The code has been modified to use the JAVA_HOME path specified in
the pki.conf.
The spec file has been modified to depend specifically on OpenJDK
1.8.0 and to provide the default JAVA_HOME path for the pki.conf.
https://fedorahosted.org/pki/ticket/2363
Diffstat (limited to 'specs')
| -rw-r--r-- | specs/pki-core.spec | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 63eee8094..5574c8399 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -20,6 +20,9 @@ %global package_fedora_packages 1 %endif +# Java +%define java_home /usr/lib/jvm/jre-1.8.0-openjdk + # Tomcat %if 0%{?fedora} >= 23 %define with_tomcat7 0 @@ -65,12 +68,7 @@ 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 -%else -BuildRequires: java-devel >= 1:1.8.0 -%endif BuildRequires: redhat-rpm-config BuildRequires: ldapjdk BuildRequires: apache-commons-cli @@ -286,7 +284,7 @@ least one PKI Theme package: \ Summary: Symmetric Key JNI Package Group: System Environment/Libraries -Requires: java-headless >= 1:1.8.0 +Requires: java-1.8.0-openjdk-headless Requires: nss Requires: jpackage-utils >= 0:1.7.5-10 Requires: jss >= 4.2.6-40 @@ -771,6 +769,7 @@ cd build %cmake -DVERSION=%{version}-%{release} \ -DVAR_INSTALL_DIR:PATH=/var \ -DBUILD_PKI_CORE:BOOL=ON \ + -DJAVA_HOME=%{java_home} \ -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \ -DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \ %if %{version_phase} |