Fixed jredir in favor of sdkdir for cacert path

This commit is contained in:
Jiri Vanek 2017-11-21 16:30:50 +01:00
parent d4a1c33d4e
commit ee63901778

View File

@ -1526,13 +1526,12 @@ pushd %{buildoutputdir $suffix}/images/%{jdkimage}
# Remove empty cacerts database. # Remove empty cacerts database.
rm -f $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/lib/security/cacerts rm -f $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/lib/security/cacerts
# Install cacerts symlink needed by some apps which hardcode the path. # Install cacerts symlink needed by some apps which hardcode the path.
pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir -- $suffix}/lib/security pushd $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/lib/security
RELATIVE=$(%{abs2rel} %{_sysconfdir}/pki/java \ RELATIVE=$(%{abs2rel} %{_sysconfdir}/pki/java \
%{_jvmdir}/%{jredir -- $suffix}/lib/security) %{_jvmdir}/%{sdkdir -- $suffix}/lib/security)
ln -sf $RELATIVE/cacerts . ln -sf $RELATIVE/cacerts .
popd popd
# Install versioned symlinks. # Install versioned symlinks.
pushd $RPM_BUILD_ROOT%{_jvmdir} pushd $RPM_BUILD_ROOT%{_jvmdir}
ln -sf %{sdkdir -- $suffix} %{jrelnk -- $suffix} ln -sf %{sdkdir -- $suffix} %{jrelnk -- $suffix}