X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenjdk9.git;a=blobdiff_plain;f=openjdk8.spec;h=54bafbd46f6be429fd9c3a3ad5239ba81b8af79f;hp=69a34defdd27e8f26ef1096194e29a2cf41e0421;hb=38bddea;hpb=28153feabf8cfd2242ea4eccbfea18ef7b191568

diff --git a/openjdk8.spec b/openjdk8.spec
index 69a34de..54bafbd 100644
--- a/openjdk8.spec
+++ b/openjdk8.spec
@@ -22,8 +22,8 @@
 # JDK/JRE version, as returned with `java -version`, '_' replaced with '.'
 %define		_jdkversion 1.8.0.internal
 
-%define	ver_u	66
-%define	ver_b	02
+%define	ver_u	92
+%define	ver_b	31
 Summary:	Open-source implementation of the Java Platform, Standard Edition
 Summary(pl.UTF-8):	Wolnoźródłowa implementacja Java 8 SE
 Name:		openjdk8
@@ -32,21 +32,21 @@ Release:	1
 License:	GPL v2
 Group:		Development/Languages/Java
 Source0:	%{name}-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source0-md5:	1d115662e175470270e89a4da8e0fce2
+# Source0-md5:	12c37c3002601a22d3738fbfc7ce7fc4
 Source1:	%{name}-corba-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source1-md5:	e14d8f51b9ca30d798094a2867f3f5d0
+# Source1-md5:	04527579bbf4d1d62174e580c73b37f4
 Source2:	%{name}-hotspot-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source2-md5:	b49a7b7f2db5b07306b7b5739e87ccc0
+# Source2-md5:	9af1f1d01de54a7f1ee775747e97f603
 Source3:	%{name}-jaxp-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source3-md5:	6bd5ae187272a209439d1a95ac6c9025
+# Source3-md5:	462b944cbf7f082ded61dc4e4437a23c
 Source4:	%{name}-jaxws-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source4-md5:	15e6a93009bdc73194e7118988d5ab8d
+# Source4-md5:	8e387a76f8d7c13cc3cb28efa400a134
 Source5:	%{name}-jdk-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source5-md5:	74f2cf3815659b83993c4187e7fc4f6b
+# Source5-md5:	4a9c93dfef91c94779dd7606df04116e
 Source6:	%{name}-langtools-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source6-md5:	de5c9b5fdbcd75028b71ed667d4b99d2
+# Source6-md5:	5f6e4140c3ac0b76f1841a8adcaf416a
 Source7:	%{name}-nashorn-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source7-md5:	7da4e88349cfc45ee9726eaa4386be03
+# Source7-md5:	dca7539d79ca8ff2695fab7dcd260971
 Source10:	make-cacerts.sh
 Patch0:		adjust-mflags.patch
 Patch1:		format_strings.patch
@@ -57,7 +57,6 @@ Patch5:		system-libpng.patch
 Patch6:		system-lcms.patch
 Patch7:		system-pcsclite.patch
 Patch8:		x32.patch
-Patch9:		current_stack_pointer.patch
 URL:		http://openjdk.java.net/
 BuildRequires:	/usr/bin/jar
 BuildRequires:	alsa-lib-devel
@@ -188,7 +187,7 @@ Summary:	OpenJDK - software development kit
 Summary(pl.UTF-8):	Kod OpenJDK - środowisko programistyczne
 Group:		Development/Languages/Java
 Requires:	%{name}-jre-base = %{version}-%{release}
-Requires:	jpackage-utils >= 0:1.7.5-4
+Requires:	jpackage-utils >= 0:1.7.5-7
 Provides:	jdk(%{name})
 
 %description jdk-base
@@ -271,7 +270,7 @@ wolnego oprogramowania.
 Summary:	OpenJDK - runtime environment
 Summary(pl.UTF-8):	OpenJDK - środowisko uruchomieniowe
 Group:		Development/Languages/Java
-Requires:	jpackage-utils >= 0:1.7.5-4
+Requires:	jpackage-utils >= 0:1.7.5-7
 Provides:	jre(%{name})
 
 %description jre-base
@@ -424,7 +423,6 @@ done
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -786,7 +784,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjava_crw_demo.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjavajpeg.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjavalcms.so
-%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjawt.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjdwp.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjsdt.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjsig.so
@@ -847,6 +844,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libsplashscreen.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libawt_xawt.so
 %attr(755,root,root) %{dstdir}/lib/%{jre_arch}/libjawt.so
+%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjawt.so
 
 %files jre-base-alsa
 %defattr(644,root,root,755)