From 5b42fda5cc938aa4f839ab54cf8aa71854bfcc912cb4036c37cc9bfea916a128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Fri, 22 Nov 2024 18:27:04 +0100 Subject: [PATCH 1/2] Update to 9.3.15 --- swipl-9.3.12.tar.gz | 3 --- swipl-9.3.15.tar.gz | 3 +++ swipl.changes | 9 +++++++++ swipl.spec | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 swipl-9.3.12.tar.gz create mode 100644 swipl-9.3.15.tar.gz diff --git a/swipl-9.3.12.tar.gz b/swipl-9.3.12.tar.gz deleted file mode 100644 index 42a0ef9..0000000 --- a/swipl-9.3.12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0bd042a625fecae60ffebef22ab7ade24f5c6c20748170226d2b40819db11960 -size 12340288 diff --git a/swipl-9.3.15.tar.gz b/swipl-9.3.15.tar.gz new file mode 100644 index 0000000..53cad62 --- /dev/null +++ b/swipl-9.3.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41204c428b997e93191d19a76b0236ba693e246da207330bb38afb4b9c52c12b +size 12351094 diff --git a/swipl.changes b/swipl.changes index eb68b3b..a097b7a 100644 --- a/swipl.changes +++ b/swipl.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Nov 22 13:31:23 UTC 2024 - Matej Cepl + +- 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. + ------------------------------------------------------------------- Wed Oct 9 13:15:26 UTC 2024 - Matej Cepl diff --git a/swipl.spec b/swipl.spec index 46f748d..96ee3ea 100644 --- a/swipl.spec +++ b/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 @@ -60,6 +60,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} @@ -113,6 +114,8 @@ CTEST_OPT_ARGS="" %ifarch %ix86 CTEST_OPT_ARGS+=" --exclude-regex 'swipl:transaction'" %endif +# gh#SWI-Prolog/swipl-devel#1333 +CTEST_OPT_ARGS+=" --exclude-regex 'jpl:prolog_in_java'" %ctest --verbose $CTEST_OPT_ARGS %files From 2517a3204ba3bd0e14b99343ccd1e624d0438fbdc9b338c7bd76f3f6329cb33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Fri, 22 Nov 2024 18:28:37 +0100 Subject: [PATCH 2/2] fix: failing jpl:prolog_in_java (gh#SWI-Prolog/packages-jpl#104) Patch from gh#SWI-Prolog/packages-jpl@e3be3065f2c8 --- 104-fix-prolog_in_java.patch | 46 ++++++++++++++++++++++++++++++++++++ swipl.changes | 1 + swipl.spec | 5 ++-- 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 104-fix-prolog_in_java.patch diff --git a/104-fix-prolog_in_java.patch b/104-fix-prolog_in_java.patch new file mode 100644 index 0000000..a23e188 --- /dev/null +++ b/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 diff --git a/swipl.changes b/swipl.changes index a097b7a..27ab47c 100644 --- a/swipl.changes +++ b/swipl.changes @@ -6,6 +6,7 @@ Fri Nov 22 13:31:23 UTC 2024 - Matej Cepl 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 diff --git a/swipl.spec b/swipl.spec index 96ee3ea..0e029cd 100644 --- a/swipl.spec +++ b/swipl.spec @@ -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 @@ -114,8 +117,6 @@ CTEST_OPT_ARGS="" %ifarch %ix86 CTEST_OPT_ARGS+=" --exclude-regex 'swipl:transaction'" %endif -# gh#SWI-Prolog/swipl-devel#1333 -CTEST_OPT_ARGS+=" --exclude-regex 'jpl:prolog_in_java'" %ctest --verbose $CTEST_OPT_ARGS %files