Merge pull request 'update-9.3.15' (#6) from mcepl/swipl:update-9.3.15 into factory

Patch from gh#SWI-Prolog/packages-jpl@e3be3065f2c8

104-fix-prolog_in_java.patch

@@ -0,0 +1,46 @@
+---
+ packages/jpl/cmake/JUnit.cmake |   33 ++++++++++++++++++++++-----------
+ 1 file changed, 22 insertions(+), 11 deletions(-)
+
+--- a/packages/jpl/cmake/JUnit.cmake
++++ b/packages/jpl/cmake/JUnit.cmake
+@@ -16,17 +16,28 @@
+ # Unfortunately GLOB ? means exactly one, so cannot use it to make the - optional!
+ ## GLOB EXPRESSION: https://facelessuser.github.io/wcmatch/glob/
+ if(NOT JUNIT_JAR)
+-  file(GLOB JUNIT_JAR
+-                ${JAVA_LIB_INSTALL_DIR}/junit4.jar
+-                ${JAVA_LIB_INSTALL_DIR}/junit-4*.jar
+-                /usr/share/java/junit4.jar
+-                /usr/share/java/junit-4*.jar
+-                /usr/share/java/junit.jar
+-                /opt/local/share/java/junit.jar     # Macport
+-                /opt/local/share/java/junit4.jar
+-                /opt/local/share/java/junit-4*.jar
+-                /usr/local/share/java/junit4.jar
+-                /usr/local/share/java/junit-4*.jar)
++  file(GLOB F_JUNIT_JAR
++       ${JAVA_LIB_INSTALL_DIR}/junit4.jar
++       ${JAVA_LIB_INSTALL_DIR}/junit-4*.jar
++       /usr/share/java/junit4.jar
++       /usr/share/java/junit-4*.jar
++       /opt/local/share/java/junit4.jar
++       /opt/local/share/java/junit-4*.jar
++       /usr/local/share/java/junit4.jar
++       /usr/local/share/java/junit-4*.jar)
++  if(NOT F_JUNIT_JAR)
++    file(GLOB F_JUNIT_JAR
++       /usr/share/java/junit.jar
++       /opt/local/share/java/junit.jar)
++  endif()
++  if(F_JUNIT_JAR)
++    list(GET F_JUNIT_JAR 0 F_JUNIT_JAR)
++    message("Found junit at ${F_JUNIT_JAR}")
++  else()
++    message("Could not find junit.jar.")
++  endif()
++  set(JUNIT_JAR ${F_JUNIT_JAR} CACHE FILEPATH
++      "junit4 jar file")
+ endif()
+ MARK_AS_ADVANCED(JUNIT_JAR)
+ find_file(HAMCREST

swipl.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Nov 22 13:31:23 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
+
+- Update to 9.3.15:
+  Complete changelog is
+  https://www.swi-prolog.org/ChangeLog?branch=development&from=9.3.12&to=9.3.15
+  and upstream still doesn’t provide any abbreviated version, and
+  the list of changes is still too long to enumerate here.
+- Add 104-fix-prolog_in_java.patch to fix failing test jpl:prolog_in_java
+
 -------------------------------------------------------------------
 Wed Oct  9 13:15:26 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
 

swipl.spec

@@ -17,7 +17,7 @@
 
 
 Name:           swipl
-Version:        9.3.12
+Version:        9.3.15
 Release:        0
 Summary:        Prolog Compiler
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -26,6 +26,9 @@ Source0:        https://www.swi-prolog.org/download/devel/src/swipl-%{version}.t
 Source98:       swipl-rpmlintrc
 # For SOURCE_DATE_EPOCH variable- reproducible builds
 Source99:       %{name}.changes
+# PATCH-FIX-UPSTREAM 104-fix-prolog_in_java.patch gh#SWI-Prolog/packages-jpl#104 mcepl@suse.com
+# Fix the wrong location of hamcrest location
+Patch0:         104-fix-prolog_in_java.patch
 BuildRequires:  cmake
 BuildRequires:  db-devel
 BuildRequires:  fdupes
@@ -60,6 +63,7 @@ BuildRequires:  pkgconfig(xpm)
 BuildRequires:  pkgconfig(xrender)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(yaml-0.1)
+BuildRequires:  hamcrest
 Provides:       swi-prolog = %{version}
 Provides:       swi_pl = %{version}
 Obsoletes:      swi-prolog < %{version}