[pl] 6.2.1 bump

[Petr Pisar]

commit 483cb6fc8ef9f8836657fd048b789dc837528227
Author: Petr Písař <ppisar at redhat.com>
Date:   Mon Sep 10 13:22:06 2012 +0200

    6.2.1 bump

 .gitignore                                         |    2 +
 ...48-libjpl.so-must-be-linked-against-swipl.patch |   64 --------------------
 ...configure.patch => pl-6.2.1-jpl-configure.patch |   15 +++--
 pl.spec                                            |   10 ++--
 sources                                            |    4 +-
 5 files changed, 17 insertions(+), 78 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b9c27ff..86e206f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ SWI-Prolog-5.7.11.pdf
 /SWI-Prolog-6.0.2.pdf
 /pl-6.2.0.tar.gz
 /SWI-Prolog-6.2.0.pdf
+/pl-6.2.1.tar.gz
+/SWI-Prolog-6.2.1.pdf
diff --git a/pl-6.2.0-jpl-configure.patch b/pl-6.2.1-jpl-configure.patch
similarity index 85%
rename from pl-6.2.0-jpl-configure.patch
rename to pl-6.2.1-jpl-configure.patch
index 6135fbe..61dfa54 100644
--- a/pl-6.2.0-jpl-configure.patch
+++ b/pl-6.2.1-jpl-configure.patch
@@ -1,9 +1,9 @@
-diff -Naur pl-6.2.0/packages/jpl/configure pl-6.2.0.new/packages/jpl/configure
---- pl-6.2.0/packages/jpl/configure	2012-08-21 09:57:39.000000000 +0200
-+++ pl-6.2.0.new/packages/jpl/configure	2012-08-23 16:22:58.725433338 +0200
-@@ -4552,23 +4552,6 @@
- 
+diff -Naur pl-6.2.1.old/packages/jpl/configure pl-6.2.1/packages/jpl/configure
+--- pl-6.2.1.old/packages/jpl/configure	2012-09-09 17:01:25.000000000 +0200
++++ pl-6.2.1/packages/jpl/configure	2012-09-10 13:02:26.450549569 +0200
+@@ -4555,24 +4555,6 @@
  
+ CMDEXT=sh
  
 -if test "x$JAVALIBS" = "x"; then
 -  case "$PLARCH" in
@@ -15,6 +15,7 @@ diff -Naur pl-6.2.0/packages/jpl/configure pl-6.2.0.new/packages/jpl/configure
 -	  ;;
 -     *win32*|*win64*)
 -	  JAVALIBS="-ljvm"
+-	  CMDEXT=bat
 -	  ;;
 -     *)
 -	  JAVALIBS="-ljava -lverify -ljvm"
@@ -25,7 +26,7 @@ diff -Naur pl-6.2.0/packages/jpl/configure pl-6.2.0.new/packages/jpl/configure
  case "$PLARCH" in
    *win32*|*win64*)
  	LIBJPL=jpl
-@@ -5530,15 +5513,25 @@
+@@ -5534,15 +5516,25 @@
  		_JNI_LIBDIRS="lib/amd64"
  		_JNI_LIBSUBDIRS="server"
  		;;
@@ -59,7 +60,7 @@ diff -Naur pl-6.2.0/packages/jpl/configure pl-6.2.0.new/packages/jpl/configure
  		;;
  	*)
  		# Fallback option should work on all architectures except
-@@ -5547,6 +5540,29 @@
+@@ -5551,6 +5543,29 @@
  		_JNI_LIBSUBDIRS="server"
  esac
  
diff --git a/pl.spec b/pl.spec
index c2016a2..7048b4f 100644
--- a/pl.spec
+++ b/pl.spec
@@ -2,7 +2,7 @@
 %define separate_xpce 1
 
 Name:       pl
-Version:    6.2.0
+Version:    6.2.1
 Release:    1%{?dist}
 
 Summary:    SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -23,12 +23,10 @@ Source:     %{url}download/stable/src/%{name}-%{version}.tar.gz
 Source1:    %{url}download/stable/doc/SWI-Prolog-%{version}.pdf
 Source2:    %{url}download/xpce/doc/userguide/userguide.html.tgz
 Source3:    JavaConfig.java
-Patch1:     %{name}-6.2.0-jpl-configure.patch
+Patch1:     %{name}-6.2.1-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
@@ -167,7 +165,6 @@ 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
@@ -323,6 +320,9 @@ find packages/jpl/examples -name ".cvsignore" | xargs rm -f
 
 
 %changelog
+* Mon Sep 10 2012 Petr Pisar <ppisar at redhat.com> - 6.2.1-1
+- 6.2.1 bump
+
 * Thu Aug 23 2012 Petr Pisar <ppisar at redhat.com> - 6.2.0-1
 - 6.2.0 bump
 
diff --git a/sources b/sources
index fe6a318..375bbc3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 a4462019611caa4f69247c8bf94404a7  userguide.html.tgz
-969ed2e00b7afc1537fbf19d667333c5  pl-6.2.0.tar.gz
-303ae1ebb209a773a51ab9c5920ffc14  SWI-Prolog-6.2.0.pdf
+aa1d6d47530d4d13e2ebe2c64958e61a  pl-6.2.1.tar.gz
+27ed899e754eea51a322be40d9fae887  SWI-Prolog-6.2.1.pdf