Hello community, here is the log from the commit of package java-10-openjdk for openSUSE:Factory checked in at 2018-03-04 11:53:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-10-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-10-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-10-openjdk" Sun Mar 4 11:53:40 2018 rev:13 rq:581916 version:10.0.0.0~45 Changes: -------- --- /work/SRC/openSUSE:Factory/java-10-openjdk/java-10-openjdk.changes 2018-02-22 14:58:17.742962805 +0100 +++ /work/SRC/openSUSE:Factory/.java-10-openjdk.new/java-10-openjdk.changes 2018-03-04 11:53:49.823494342 +0100 @@ -1,0 +2,14 @@ +Fri Mar 2 07:20:39 UTC 2018 - [email protected] + +- Modified patch: + * system-pcsclite.patch + + Fix merge error in the patch + +------------------------------------------------------------------- +Wed Feb 28 16:46:19 UTC 2018 - [email protected] + +- Update to tag jdk-10+45 + * Fixes: + + S8198658: Docs still point to JDK 9 docs + +------------------------------------------------------------------- Old: ---- 663f20fc5109.tar.bz2 New: ---- 4f96cf952e71.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-10-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.jaA6ed/_old 2018-03-04 11:53:52.679391541 +0100 +++ /var/tmp/diff_new_pack.jaA6ed/_new 2018-03-04 11:53:52.683391397 +0100 @@ -33,10 +33,10 @@ %global updatever 0 %global patchver 0 %global datever 2018-03-20 -%global buildver 44 +%global buildver 45 %global hg_project jdk %global hg_repository jdk10 -%global hg_revision 663f20fc5109 +%global hg_revision 4f96cf952e71 %global icedtea_sound_version 1.0.1 %global java_atk_wrapper_version 0.33.2 # priority must be 6 digits in total @@ -122,7 +122,7 @@ Version: %{featurever}.%{interimver}.%{updatever}.%{patchver}~%{buildver} Release: 0 Summary: OpenJDK 10 Runtime Environment -License: Apache-1.1 AND Apache-2.0 AND GPL-1.0+ AND GPL-2.0 AND GPL-2.0-with-classpath-exception AND LGPL-2.0 AND MPL-1.0 AND MPL-1.1 AND SUSE-Public-Domain AND W3C +License: Apache-1.1 AND Apache-2.0 AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-with-classpath-exception AND LGPL-2.0-only AND MPL-1.0 AND MPL-1.1 AND SUSE-Public-Domain AND W3C Group: Development/Languages/Java Url: http://openjdk.java.net/ # Sources from upstream OpenJDK10 project. ++++++ 663f20fc5109.tar.bz2 -> 4f96cf952e71.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-10-openjdk/663f20fc5109.tar.bz2 /work/SRC/openSUSE:Factory/.java-10-openjdk.new/4f96cf952e71.tar.bz2 differ: char 11, line 1 ++++++ system-pcsclite.patch ++++++ --- /var/tmp/diff_new_pack.jaA6ed/_old 2018-03-04 11:53:52.947381895 +0100 +++ /var/tmp/diff_new_pack.jaA6ed/_new 2018-03-04 11:53:52.947381895 +0100 @@ -98,17 +98,15 @@ /* * Throws a Java Exception by name -@@ -75,7 +77,9 @@ +@@ -75,6 +77,7 @@ throwByName(env, "java/io/IOException", msg); } +#ifndef USE_SYSTEM_LIBPCSCLITE void *findFunction(JNIEnv *env, void *hModule, char *functionName) { -+ return NULL; void *fAddress = dlsym(hModule, functionName); if (fAddress == NULL) { - char errorMessage[256]; -@@ -85,9 +89,11 @@ +@@ -85,9 +88,11 @@ } return fAddress; } @@ -120,7 +118,7 @@ const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL); if (libName == NULL) { throwNullPointerException(env, "PCSC library name is null"); -@@ -141,4 +147,5 @@ +@@ -141,4 +146,5 @@ #else scardControl = (FPTR_SCardControl) findFunction(env, hModule, "SCardControl132"); #endif // __APPLE__
