- added jni patch (fixes jni libdir detection in openjdk8/x86 case)

diff --git a/pl-jni.patch b/pl-jni.patch
new file mode 100644 (file)
index 0000000..ed74302
--- /dev/null
+++ b/pl-jni.patch
@@ -0,0 +1,11 @@
+--- swipl-7.2.3/packages/jpl/ac/ac_jni_include_dirs.m4.orig    2015-06-18 13:26:49.000000000 +0200
++++ swipl-7.2.3/packages/jpl/ac/ac_jni_include_dirs.m4 2016-03-10 20:50:26.685681495 +0100
+@@ -77,7 +77,7 @@
+ *)  case "$host_cpu" in
+       i?86)
+               _JNI_LIBDIRS="lib/i386"
+-              _JNI_LIBSUBDIRS="client"
++              _JNI_LIBSUBDIRS="client server"
+               ;;
+       x86_64)
+               _JNI_LIBDIRS="lib/amd64"

diff --git a/pl.spec b/pl.spec
index d4222383875d43abba97ff5eeabc9896fab93dea..cbd394bb6f28f6e5df04869db7c9054ef6fa1bbe 100644 (file)
--- a/pl.spec
+++ b/pl.spec
@@ -29,6 +29,7 @@ Source0:      http://www.swi-prolog.org/download/stable/src/swi%{name}-%{version}.tar
 Patch0:                %{name}-clib-configure.patch
 Patch1:                %{name}-xpce-install.patch
 Patch2:                %{name}-format.patch
+Patch3:                %{name}-jni.patch
 URL:           http://www.swi-prolog.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -152,6 +153,7 @@ Prolog.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %{__mv} src/Tests/core/test_d_break.pl{,disabled}