Fridrich Strba 2017-03-01 08:23:45 +00:00 committed by Git OBS Bridge
parent bd7709d55a
commit 66b054abbd

View File

@ -138,16 +138,12 @@
%if 0%{?__isa_bits}
%global bits %{__isa_bits}
%endif
%bcond_with zero
%if 0%{?suse_version} >= 1330 || 0%{?suse_version} == 1315
%if %{with bootstrap}
%global with_sunec 0
%else
%global with_sunec 1
%endif
%else
%global with_sunec 0
%endif
%bcond_with zero
# Turn on/off some features depending on openSUSE version
%if 0%{?suse_version} >= 1130
%if ! %{with zero}
@ -187,10 +183,8 @@ Source6: http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_v
Source7: http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/langtools.tar.xz
Source8: http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/hotspot.tar.xz
Source9: http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/nashorn.tar.xz
# Test
Source10: TestECDSA.java
# RPM/distribution specific patches
# RHBZ 1015432
Patch2: 1015432.patch
@ -878,6 +872,7 @@ then
update-alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
fi
%if %{with_sunec}
%check
export JAVA_HOME=$(pwd)/%{buildoutputdir}images/j2sdk-image
@ -885,6 +880,8 @@ export JAVA_HOME=$(pwd)/%{buildoutputdir}images/j2sdk-image
$JAVA_HOME/bin/javac -d . %{SOURCE10}
$JAVA_HOME/bin/java TestECDSA
%endif
%if 0%{?suse_version} >= 1130
%posttrans headless
# bnc#781690#c11: don't trust user defined JAVA_HOME and use the current VM