forked from pool/java-1_8_0-openjdk
		
	This commit is contained in:
		@@ -1,3 +1,3 @@
 | 
			
		||||
version https://git-lfs.github.com/spec/v1
 | 
			
		||||
oid sha256:b2a76be156bf7af00dd705abe80ea819afa7b42ad2dbc37dac4df05f87d3803c
 | 
			
		||||
size 6785636
 | 
			
		||||
oid sha256:ce479d60e7e9c155c5489bb04f0f94b339c0dda7c08ca0ab595268dbd17ff9f2
 | 
			
		||||
size 6792096
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,3 @@
 | 
			
		||||
version https://git-lfs.github.com/spec/v1
 | 
			
		||||
oid sha256:69200a5f46b917f5ffcdb64729e6871cdbe152d767a569e18be3725b45536a32
 | 
			
		||||
size 945136
 | 
			
		||||
oid sha256:a360315b2a5fc1e6d786a046051d39cb8c06756dedb2f70d9f5572132ed6e30e
 | 
			
		||||
size 946136
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,3 @@
 | 
			
		||||
version https://git-lfs.github.com/spec/v1
 | 
			
		||||
oid sha256:ce71e125b3ac598f8a46bcbdd2c9e5727beeee15c1e081b06d49aa5346afb897
 | 
			
		||||
size 6880664
 | 
			
		||||
oid sha256:038cf6262034f9f920ec6b870bf3e5d75828190985aafe3e107850ce56a9fe9a
 | 
			
		||||
size 6887280
 | 
			
		||||
 
 | 
			
		||||
@@ -1,22 +0,0 @@
 | 
			
		||||
--- icedtea-3.0.1/acinclude.m4	2016-04-24 08:37:02.061302798 +0200
 | 
			
		||||
+++ icedtea-3.0.1/acinclude.m4	2016-04-25 13:04:21.040872931 +0200
 | 
			
		||||
@@ -1959,7 +1959,7 @@
 | 
			
		||||
     PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no])
 | 
			
		||||
     if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
 | 
			
		||||
       SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS;
 | 
			
		||||
-      SUNEC_LIBS="-lfreebl $NSS_LIBS";
 | 
			
		||||
+      SUNEC_LIBS=$NSS_SOFTOKN_LIBS;
 | 
			
		||||
    elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
 | 
			
		||||
       SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";
 | 
			
		||||
       SUNEC_LIBS=$NSS_JAVA_LIBS;
 | 
			
		||||
--- icedtea-3.0.1/configure	2016-04-24 08:37:14.373081753 +0200
 | 
			
		||||
+++ icedtea-3.0.1/configure	2016-04-25 13:05:26.851392635 +0200
 | 
			
		||||
@@ -7925,7 +7925,7 @@
 | 
			
		||||
 fi
 | 
			
		||||
     if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
 | 
			
		||||
       SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS;
 | 
			
		||||
-      SUNEC_LIBS="-lfreebl $NSS_LIBS";
 | 
			
		||||
+      SUNEC_LIBS=$NSS_SOFTOKN_LIBS;
 | 
			
		||||
    elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
 | 
			
		||||
       SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";
 | 
			
		||||
       SUNEC_LIBS=$NSS_JAVA_LIBS;
 | 
			
		||||
@@ -1,3 +0,0 @@
 | 
			
		||||
version https://git-lfs.github.com/spec/v1
 | 
			
		||||
oid sha256:ac4c5ec996555db6b4943e3849afc72ba2504b14c7d443cded68dd7d7e0055f9
 | 
			
		||||
size 1538932
 | 
			
		||||
							
								
								
									
										3
									
								
								icedtea-3.11.0.tar.xz
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								icedtea-3.11.0.tar.xz
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,3 @@
 | 
			
		||||
version https://git-lfs.github.com/spec/v1
 | 
			
		||||
oid sha256:c0954df4cd616bb65e1c41d944fdde74d94a7426848f39457ba11586915d11f9
 | 
			
		||||
size 1552144
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,3 @@
 | 
			
		||||
version https://git-lfs.github.com/spec/v1
 | 
			
		||||
oid sha256:79277071c09112f9383de9b0fd813a5e135e4525562890c17ed44ca0d90dbcfb
 | 
			
		||||
size 2290528
 | 
			
		||||
oid sha256:7b9fc4178403d36fc9d15223ad25aa524976ca134a83544b3c7d1355b0be08ad
 | 
			
		||||
size 2291488
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,3 @@
 | 
			
		||||
version https://git-lfs.github.com/spec/v1
 | 
			
		||||
oid sha256:92f3cb8a4f615e962fcb6dd40e81dc3134741dbb0dba1556527604d15d765786
 | 
			
		||||
size 2273848
 | 
			
		||||
oid sha256:b009c14bd56e30319ffb4929bef07853a7cf6a38d20e394d8b9a9f94706d2ebd
 | 
			
		||||
size 2274588
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,3 @@
 | 
			
		||||
version https://git-lfs.github.com/spec/v1
 | 
			
		||||
oid sha256:c29b268f08c5615904098126458c5ccc32d9d31457482b97d2ed70b94b79cab5
 | 
			
		||||
size 39217432
 | 
			
		||||
oid sha256:0e20c73bd59536d9148008c64e1de562408b4e2bdfe72e5d20b08b3bdab5b132
 | 
			
		||||
size 39248532
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,3 @@
 | 
			
		||||
version https://git-lfs.github.com/spec/v1
 | 
			
		||||
oid sha256:f2786cd6963696cb989fcd27054505ec74c0f2e31a485f5550ddbe3ad065a917
 | 
			
		||||
size 2072856
 | 
			
		||||
oid sha256:34bba6c97b4cc02fbd514a2a435224a025b175d5b34bf0f6eb85f0cc6295ab79
 | 
			
		||||
size 2073920
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,3 @@
 | 
			
		||||
version https://git-lfs.github.com/spec/v1
 | 
			
		||||
oid sha256:9ed937e497e30344a2ee4a938cdec81b5b79642f3c7106f3abf911318fdda99d
 | 
			
		||||
size 2320504
 | 
			
		||||
oid sha256:cd0ced75640eb6bb650f2a549d6f0a1f3fe3bad4e9d11d6705693e1a15813f83
 | 
			
		||||
size 2317604
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,3 @@
 | 
			
		||||
version https://git-lfs.github.com/spec/v1
 | 
			
		||||
oid sha256:fc760130ce1c6dc2379f5b219615344ee25d6380ea24813da53fe034eeb4d156
 | 
			
		||||
size 338992
 | 
			
		||||
oid sha256:b7f34d2bc2bc35c45971e57e900e1558a9d8ac1a17a0be730cb1c9e9c504817c
 | 
			
		||||
size 358224
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user