X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenjdk8.git;a=blobdiff_plain;f=openjdk8.spec;h=056e3e415f80a8588e2c60e07d555f6a29cbb25d;hp=f9e11205dc93a5b478d56446d6ef03e31232200a;hb=c5052a686dcc420db28d8094e6823be5c14a0cd7;hpb=5b4e4f2029cedce6ca6797d0e14efcf5ab23545e

diff --git a/openjdk8.spec b/openjdk8.spec
index f9e1120..056e3e4 100644
--- a/openjdk8.spec
+++ b/openjdk8.spec
@@ -1,6 +1,5 @@
 #
 # TODO:
-#	- use the release snapshots (the jdk8u repo?) instead of latest 'b' tag
 #	- make it build
 # 	- make it install
 # 	- fix BuildRequires
@@ -17,32 +16,34 @@
 %endif
 
 # class data version seen with file(1) that this jvm is able to load
-%define		_classdataversion 51.0
+%define		_classdataversion 52.0
+# JDK/JRE version, as returned with `java -version`, '_' replaced with '.'
+%define		_jdkversion 1.8.0.internal
 
 Summary:	Open-source implementation of the Java Platform, Standard Edition
 Summary(pl.UTF-8):	Wolnoźródłowa implementacja Java 8 SE
 Name:		openjdk8
-%define	minor	132
-Version:	1.8.0.%{minor}
+%define	ver_u	66
+%define	ver_b	02
+Version:	8u%{ver_u}.b%{ver_b}
 Release:	0.1
 License:	GPL v2
 Group:		Development/Languages/Java
-Source0:	openjdk8-b%{minor}.tar.bz2
-# Source0-md5:	7ae143bc2b840f1bfbfa15a1dcbcc371
-Source1:	openjdk8-corba-b%{minor}.tar.bz2
-# Source1-md5:	a54c4b046d4f9b7dc0e64b79b734d2f3
-Source2:	openjdk8-hotspot-b%{minor}.tar.bz2
-# Source2-md5:	1368abb3e02079bb7cd802d2bef136b4
-Source3:	openjdk8-jaxp-b%{minor}.tar.bz2
-# Source3-md5:	dccca275bad921fc036221ba36f9596e
-Source4:	openjdk8-jaxws-b%{minor}.tar.bz2
-# Source5-md5:	faf2d077d9c41a8c11a2b038fb5d2e50
-Source5:	openjdk8-jdk-b%{minor}.tar.bz2
-# Source5-md5:	a14e4f9a26a229fdc59dc77cf9754fee
-Source6:	openjdk8-langtools-b%{minor}.tar.bz2
-# Source6-md5:	6f6dd27e4ca48a49c0c2ec16310c44f3
-Source7:	openjdk8-nashorn-b%{minor}.tar.bz2
-# Source7-md5:	19581a68b0ffa30d8a23f384fcb8c91d
+Source0:	openjdk8-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+# Source0-md5:	1d115662e175470270e89a4da8e0fce2
+Source1:	openjdk8-corba-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+# Source1-md5:	e14d8f51b9ca30d798094a2867f3f5d0
+Source2:	openjdk8-hotspot-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+# Source2-md5:	b49a7b7f2db5b07306b7b5739e87ccc0
+Source3:	openjdk8-jaxp-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+# Source3-md5:	6bd5ae187272a209439d1a95ac6c9025
+Source4:	openjdk8-jaxws-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+Source5:	openjdk8-jdk-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+# Source5-md5:	74f2cf3815659b83993c4187e7fc4f6b
+Source6:	openjdk8-langtools-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+# Source6-md5:	de5c9b5fdbcd75028b71ed667d4b99d2
+Source7:	openjdk8-nashorn-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+# Source7-md5:	7da4e88349cfc45ee9726eaa4386be03
 Source10:	make-cacerts.sh
 Patch0:		adjust-mflags.patch
 Patch1:		format_strings.patch
@@ -144,8 +145,8 @@ Group:		Development/Languages/Java
 Requires:	%{name}-jar = %{version}-%{release}
 Requires:	%{name}-jdk-base = %{version}-%{release}
 Requires:	%{name}-jre = %{version}-%{release}
-Provides:	j2sdk = %{_version}
-Provides:	jdk = %{_version}
+Provides:	j2sdk = %{_jdkversion}
+Provides:	jdk = %{_jdkversion}
 Obsoletes:	blackdown-java-sdk
 Obsoletes:	ibm-java
 Obsoletes:	icedtea6-jdk
@@ -204,7 +205,7 @@ Provides:	java(jmx) = 1.4
 Provides:	java(jndi) = %{version}
 Provides:	java(jsse) = %{version}
 Provides:	java1.4
-Provides:	jre = %{_version}
+Provides:	jre = %{_jdkversion}
 Obsoletes:	icedtea6-jre
 Obsoletes:	icedtea7-jre
 Obsoletes:	java(jaas)
@@ -239,7 +240,7 @@ Summary(pl.UTF-8):	OpenJDK - środowisko uruchomieniowe - obsługa X11
 Group:		Development/Languages/Java
 Requires:	%{name}-jre = %{version}-%{release}
 Requires:	%{name}-jre-base-X11 = %{version}-%{release}
-Provides:	jre-X11 = %{_version}
+Provides:	jre-X11 = %{_jdkversion}
 Obsoletes:	icedtea6-jre-X11
 Obsoletes:	icedtea7-jre-X11
 Obsoletes:	java-sun-jre-X11
@@ -395,10 +396,10 @@ Code examples for OpenJDK.
 Przykłady dla OpenJDK.
 
 %prep
-%setup -qn jdk8-jdk8-b%{minor} -a1 -a2 -a3 -a4 -a5 -a6 -a7
+%setup -qn jdk8u-jdk8u%{ver_u}-b%{ver_b} -a1 -a2 -a3 -a4 -a5 -a6 -a7
 
-for d in *-jdk8-b* ; do
-	ln -s "$d" "${d%%-jdk8-b*}"
+for d in *-jdk8u*-b* ; do
+	ln -s "$d" "${d%%-jdk8u*-b*}"
 done
 
 %patch0 -p1