diff --git a/104-fix-prolog_in_java.patch b/104-fix-prolog_in_java.patch deleted file mode 100644 index a23e188..0000000 --- a/104-fix-prolog_in_java.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- - 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-9.3.15.tar.gz b/swipl-9.3.15.tar.gz deleted file mode 100644 index 53cad62..0000000 --- a/swipl-9.3.15.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41204c428b997e93191d19a76b0236ba693e246da207330bb38afb4b9c52c12b -size 12351094 diff --git a/swipl-9.3.18.tar.gz b/swipl-9.3.18.tar.gz new file mode 100644 index 0000000..142fbb6 --- /dev/null +++ b/swipl-9.3.18.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8302de3a9e204bccd8e1c1211737572a67c511d1713d13abf7a726abfb181ac3 +size 12358362 diff --git a/swipl.changes b/swipl.changes index 27ab47c..60c236f 100644 --- a/swipl.changes +++ b/swipl.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jan 8 09:32:00 UTC 2025 - Matej Cepl + +- Update to 9.3.18: + Complete changelog is + https://www.swi-prolog.org/ChangeLog?branch=development&from=9.3.15&to=9.3.18 + and upstream still doesn’t provide any abbreviated version, and + the list of changes is still too long to enumerate here. +- Remove upstreamed patch: + - 104-fix-prolog_in_java.patch + ------------------------------------------------------------------- Fri Nov 22 13:31:23 UTC 2024 - Matej Cepl diff --git a/swipl.spec b/swipl.spec index 0e029cd..1a1d481 100644 --- a/swipl.spec +++ b/swipl.spec @@ -17,7 +17,7 @@ Name: swipl -Version: 9.3.15 +Version: 9.3.18 Release: 0 Summary: Prolog Compiler License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -26,9 +26,6 @@ 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