From 65002027a0f50f8f8cbb55de6fff2f3828e272cd Mon Sep 17 00:00:00 2001
From: Petr Písař <ppisar@redhat.com>
Date: Aug 24 2012 12:14:41 +0000
Subject: Fix linking jpl.so


---

diff --git a/pl-6.2.0-FIXED-Bug-48-libjpl.so-must-be-linked-against-swipl.patch b/pl-6.2.0-FIXED-Bug-48-libjpl.so-must-be-linked-against-swipl.patch
new file mode 100644
index 0000000..dbeffe3
--- /dev/null
+++ b/pl-6.2.0-FIXED-Bug-48-libjpl.so-must-be-linked-against-swipl.patch
@@ -0,0 +1,64 @@
+From 1b17bd751601202687f28b95e38013418ac580b2 Mon Sep 17 00:00:00 2001
+From: Jan Wielemaker <J.Wielemaker@cs.vu.nl>
+Date: Fri, 24 Aug 2012 10:45:46 +0200
+Subject: [PATCH] FIXED: Bug#48: libjpl.so must be linked against swipl.lib
+
+---
+ packages/Dialect.defs.in | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/packages/Dialect.defs.in b/packages/Dialect.defs.in
+index d569fff..cd65855 100644
+--- a/packages/Dialect.defs.in
++++ b/packages/Dialect.defs.in
+@@ -20,6 +20,8 @@
+ #   * LIBPLSO
+ #   Library to include for linking shared objects to the Prolog kernel.
+ #   Added after the user files.
++#   * LIBPLEMBED
++#   Library containing the Prolog kernel.  Needed for embedding Prolog.
+ 
+ PL=../swipl.sh
+ PLBASE=@PLBASE@
+@@ -45,10 +47,11 @@ DEFS=@DEFS@ -D__SWI_PROLOG__
+ CFLAGS=$(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) $(PKGCFLAGS) $(DEFS)
+ CXXFLAGS=$(CFLAGS) -I../cpp
+ 
++LIBPLEMBED=@USEPLLIB@
+ ifeq (@EXEFORMAT@,ELF)
+ LIBPLSO=
+ else
+-LIBPLSO=-lswipl
++LIBPLSO=$(LIBPL)
+ endif
+ 
+ PLLDFLAGS=@LDFLAGS@ -L@abs_top_builddir@/../lib/$(PLARCH)
+-- 
+1.7.11.4
+
+Submodule: packages/jpl
+From fee8dd81b50c9f28852cbf7d882eedff9e342a9e Mon Sep 17 00:00:00 2001
+From: Jan Wielemaker <J.Wielemaker@cs.vu.nl>
+Date: Fri, 24 Aug 2012 10:46:59 +0200
+Subject: [PATCH] FIXED: Bug#48: use new LIBPLEMBED from Dialect.in
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packages/jpl/Makefile.in b/packages/jpl/Makefile.in
+index 06a14de..e44b6e2 100644
+--- a/packages/jpl/Makefile.in
++++ b/packages/jpl/Makefile.in
+@@ -34,7 +34,7 @@ OBJ=		src/c/jpl.o
+ all:		$(TARGETS) jpl.jar exjava-compile jpl_doc
+ 
+ $(LIBJPL):	$(OBJ)
+-		$(LD) $(LDSOFLAGS) -o $@ $(OBJ) $(LIBS) $(JAVALIBS) $(LIBPLSO)
++		$(LD) $(LDSOFLAGS) -o $@ $(OBJ) $(LIBS) $(JAVALIBS) $(LIBPLEMBED)
+ 		if [ -r @LIBJPL@.dylib ]; then \
+ 		  rm -f @LIBJPL@.jnilib && ln -s @LIBJPL@.dylib @LIBJPL@.jnilib ; \
+ 		fi
+-- 
+1.7.11.4
+
diff --git a/pl.spec b/pl.spec
index 60cbc2a..c2016a2 100644
--- a/pl.spec
+++ b/pl.spec
@@ -27,6 +27,8 @@ Patch1:     %{name}-6.2.0-jpl-configure.patch
 Patch2:     %{name}-5.10.5-man-files.patch
 Patch3:     %{name}-6.0.2-jni.patch
 Patch4:     %{name}-6.2.0-pc.patch
+# In upstream after 6.2.0, swibug #48
+Patch5:     %{name}-6.2.0-FIXED-Bug-48-libjpl.so-must-be-linked-against-swipl.patch
 
 # Base
 BuildRequires:  gmp-devel
@@ -165,6 +167,7 @@ in Prolog. In both setups it provides a re-entrant bidirectional interface.
 %patch2 -p1 -b .man-files
 %patch3 -p1 -b .jni
 %patch4 -p1 -b .pc
+%patch5 -p1 -b .jpl_needs_swipl
 (
    cd src
    autoconf