Hello community,

here is the log from the commit of package java-9-openjdk for openSUSE:Factory 
checked in at 2018-03-06 10:43:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-9-openjdk (Old)
 and      /work/SRC/openSUSE:Factory/.java-9-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "java-9-openjdk"

Tue Mar  6 10:43:41 2018 rev:22 rq:581915 version:9.0.4.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/java-9-openjdk/java-9-openjdk.changes    
2018-02-21 14:09:07.707251971 +0100
+++ /work/SRC/openSUSE:Factory/.java-9-openjdk.new/java-9-openjdk.changes       
2018-03-06 10:43:44.307978220 +0100
@@ -1,0 +2,7 @@
+Fri Mar  2 07:20:39 UTC 2018 - fst...@suse.com
+
+- Modified patch:
+  * system-pcsclite.patch
+    + Fix merge error in the patch
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ java-9-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.tGWFK6/_old  2018-03-06 10:43:46.839886743 +0100
+++ /var/tmp/diff_new_pack.tGWFK6/_new  2018-03-06 10:43:46.843886598 +0100
@@ -129,7 +129,7 @@
 Version:        %{majorver}.%{minorver}.%{securityver}.%{patchver}
 Release:        0
 Summary:        OpenJDK 9 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 OpenJDK9 project.

++++++ system-pcsclite.patch ++++++
--- /var/tmp/diff_new_pack.tGWFK6/_old  2018-03-06 10:43:47.107877061 +0100
+++ /var/tmp/diff_new_pack.tGWFK6/_new  2018-03-06 10:43:47.111876917 +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__


Reply via email to