Compare commits

..

4 Commits

9 changed files with 14 additions and 91 deletions

1
.gitignore vendored
View File

@ -1,2 +1 @@
.osc
_scmsync.obsinfo

View File

@ -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

4
_scmsync.obsinfo Normal file
View File

@ -0,0 +1,4 @@
mtime: 1721642934
commit: b36f0d540729c04b66ede73dc7ed25b05f8e05e87fd363df7de46b1bc07d00ba
url: https://src.opensuse.org/mcepl_pkgs/swipl.git
revision: b36f0d540729c04b66ede73dc7ed25b05f8e05e87fd363df7de46b1bc07d00ba

3
build.specials.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5c44722cb227aad3eba9242c5ac591fc06d6b5730bff6d837c3673ecf4dd22f5
size 272

BIN
swipl-9.3.15.tar.gz (Stored with Git LFS)

Binary file not shown.

3
swipl-9.3.7.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ee557317543ac5934a703f2c9d79d60a9a1e6fcbd0fe8bf6034a5afccd9754e1
size 12282836

BIN
swipl-9.3.8.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,39 +1,3 @@
-------------------------------------------------------------------
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 doesnt 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>
- Update to 9.3.12
Complete changelog is
https://www.swi-prolog.org/ChangeLog?branch=development&from=9.3.11&to=9.3.12
and upstream still doesnt provide any abbreviated version, and
the list of changes is still too long to enumerate here.
-------------------------------------------------------------------
Tue Sep 24 09:43:00 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
- Update to 9.3.11
Complete changelog is
https://www.swi-prolog.org/ChangeLog?branch=development&from=9.3.10&to=9.3.11
and upstream still doesnt provide any abbreviated version, and
the list of changes is still too long to enumerate here.
-------------------------------------------------------------------
Sat Sep 7 06:32:48 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
- Update to 9.3.10:
Complete changelog is
https://www.swi-prolog.org/ChangeLog?branch=development&from=9.3.8&to=9.3.10
and upstream still doesnt provide any abbreviated version.
-------------------------------------------------------------------
Mon Jul 22 10:08:40 UTC 2024 - Matej Cepl <mcepl@cepl.eu>

View File

@ -17,7 +17,7 @@
Name: swipl
Version: 9.3.15
Version: 9.3.8
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
@ -63,7 +60,6 @@ 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}