OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=307

java-1_8_0-openjdk.spec

@@ -18,7 +18,7 @@
 
 %{!?aarch64:%global aarch64 aarch64 arm64 armv8}
 %global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64} %{arm}
-%global icedtea_version 3.10.0
+%global icedtea_version 3.11.0
 %global icedtea_sound_version 1.0.1
 %global buildoutputdir openjdk.build/
 # Convert an absolute path to a relative path.  Each symbolic link is
@@ -32,8 +32,8 @@
 # priority must be 6 digits in total
 %global priority        1805
 %global javaver         1.8.0
-%global updatever       191
-%global buildver        12
+%global updatever       201
+%global buildver        8
 # Standard JPackage directories and symbolic links.
 %global sdklnk          java-%{javaver}-openjdk
 %global archname        %{sdklnk}
@@ -134,11 +134,6 @@
 %if 0%{?__isa_bits}
 %global bits %{__isa_bits}
 %endif
-%if 0%{?suse_version} >= 1330 || 0%{?suse_version} == 1315
-%global with_sunec 1
-%else
-%global with_sunec 0
-%endif
 %bcond_without bootstrap
 %bcond_with zero
 # Turn on/off some features depending on openSUSE version
@@ -195,7 +190,7 @@ Patch14:        zero-javadoc-verbose.patch
 #
 # Patch for PPC
 Patch103:       ppc-zero-hotspot.patch
-Patch1000:      icedtea-3.0.1-sunec.patch
+
 Patch1001:      java-1_8_0-openjdk-suse-desktop-files.patch
 Patch1002:      icedtea-3.8.0-s390.patch
 Patch2001:      disable-doclint-by-default.patch
@@ -337,14 +332,7 @@ Provides:       jsse = %{version}
 # ...
 # java.io.FileNotFoundException: /usr/lib64/libnss3.so
 #was bnc#634793
-%if %{with sunec}
-# The SunEC built against system NSS uses private APIs that
-# change from time to time. Require thus the version we built
-# against.
-%requires_ge    mozilla-nss
-%else
 Requires:       mozilla-nss
-%endif
 
 %description headless
 The OpenJDK 8 runtime environment without audio and video support.
@@ -424,7 +412,6 @@ this package unless you really need to.
 %setup -q -n icedtea-%{icedtea_version}
 %setup -q -D -n icedtea-%{icedtea_version} -T -a 1
 
-%patch1000 -p1
 %patch1001 -p1
 %ifarch s390
 %patch1002 -p1
@@ -457,22 +444,14 @@ CXXFLAGS="$CXXFLAGS -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-d
 export CFLAGS
 export CXXFLAGS
 
-%if %{with_sunec}
-export NSS_SOFTOKN_CFLAGS="`pkg-config --cflags nss` -I`pwd`"
-export NSS_SOFTOKN_LIBS="-L%{_libdir} -lnssdbm3 -lsoftokn3 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lfreebl -L%{_libdir}/nspr -lplds4 -lplc4 -lnspr4"
-export NSS_CFLAGS="$NSS_SOFTOKN_CFLAGS"
-export NSS_LIBS="$NSS_SOFTOKN_LIBS"
-%endif
-
 sh autogen.sh
 %configure \
         --disable-downloading \
         --with-tzdata-dir=%{_datadir}/javazi \
         --with-pkgversion="build %{javaver}_%{updatever}-b%{buildver} suse-%{release}-%{_arch}" \
         --with-jdk-home="%{_sysconfdir}/alternatives/java_sdk" \
-%if %{with_sunec}
-        --enable-sunec \
-%endif
+        --enable-nss \
+        --enable-non-nss-curves \
 %if %{with bootstrap}
         --enable-bootstrap \
 %else