[pl] 6.0.1 bump

[Petr Pisar]

commit 623cf3d86f73a50d59aef207c9a8aa165fcb0877
Author: Petr Písař <ppisar at redhat.com>
Date:   Thu Mar 1 15:47:51 2012 +0100

    6.0.1 bump

 .gitignore                                         |    2 +
 pl.spec                                            |   25 +++-----
 sources                                            |    4 +-
 ...g-9-Loading-incomplete-GIF-files-causes-a.patch |   60 -------------------
 ...ke-sure-all-pixels-are-within-the-allocat.patch |   61 --------------------
 5 files changed, 14 insertions(+), 138 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0533b0e..8a6039f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ SWI-Prolog-5.7.11.pdf
 /userguide.html.tgz
 /pl-5.10.5.tar.gz
 /SWI-Prolog-5.10.5.pdf
+/pl-6.0.1.tar.gz
+/SWI-Prolog-6.0.1.pdf
diff --git a/pl.spec b/pl.spec
index a8c9876..10824c6 100644
--- a/pl.spec
+++ b/pl.spec
@@ -6,13 +6,13 @@
 %define jdkverlong %{jdkvershort}.0
 
 Name:       pl
-Version:    5.10.5
-Release:    7%{?dist}
+Version:    6.0.1
+Release:    1%{?dist}
 
 Summary:    SWI-Prolog - Edinburgh compatible Prolog compiler
 
 Group:      Development/Languages
-#packages/clib/random.c         Artistic
+#packages/plunit/plunit.pl      Artistic
 #packages/clib/uri.c            LGPLv2+
 #packages/sgml/Test/test.pl     LGPLv2
 #library/qsave.pl               GPLv2+
@@ -30,10 +30,6 @@ Patch1:     %{name}-5.10.5-jpl-configure.patch
 Patch2:     %{name}-5.10.5-man-files.patch
 Patch3:     %{name}-5.10.2-jni.patch
 Patch4:     %{name}-5.10.5-pc.patch
-# Upstream bug #9, will be in 5.10.6, rhbz#732952
-Patch5:     xpce-5.10.5-SECURITY-Bug-9-Loading-incomplete-GIF-files-causes-a.patch
-# Upstream bug #9, will be in 5.10.6, rhbz#732952
-Patch6:     xpce-5.10.5-SECURITY-Make-sure-all-pixels-are-within-the-allocat.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Base
@@ -51,6 +47,7 @@ BuildRequires:  libXinerama-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  libXt-devel
 # Freetype support in XPCE
+BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel
 BuildRequires:  libXaw-devel
 BuildRequires:  libXext-devel
@@ -141,11 +138,6 @@ in Prolog. In both setups it provides a re-entrant bidirectional interface.
 %patch3 -p1 -b .jni
 %patch4 -p1 -b .pc
 (
-cd packages/xpce
-%patch5 -p1 -b .incomplete_gif
-%patch6 -p1 -b .validate_pixel_color
-)
-(
    cd src
    autoconf
 )
@@ -266,7 +258,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc ReleaseNotes/relnotes-5.10 README COPYING VERSION
-%doc dotfiles/dotplrc
+%doc customize/dotplrc
 %doc %{docdir}/*
 %{_mandir}/man1/*
 %dir %{_libdir}/swipl-%{version}
@@ -291,7 +283,7 @@ rm -rf $RPM_BUILD_ROOT
 # XPCE
 %exclude %{_bindir}/xpce*
 %exclude %{_libdir}/swipl-%{version}/bin/*/xpce
-%exclude %{_libdir}/swipl-%{version}/dotfiles/dotxpcerc
+%exclude %{_libdir}/swipl-%{version}/customize/dotxpcerc
 %exclude %{_libdir}/swipl-%{version}/xpce*
 %exclude %{_libdir}/swipl-%{version}/library/http/xpce_httpd.pl
 %endif
@@ -300,7 +292,7 @@ rm -rf $RPM_BUILD_ROOT
 %files xpce
 %defattr(-,root,root,-)
 %doc %[docdir-xpce}/*
-%doc dotfiles/dotxpcerc
+%doc customize/dotxpcerc
 %{_bindir}/xpce*
 %{_includedir}/swipl/xpce
 %{_libdir}/swipl-%{version}/bin/*/xpce
@@ -330,6 +322,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 01 2012 Petr Pisar <ppisar at redhat.com> - 6.0.1-1
+- 6.0.1 bump
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.10.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index cdd9384..4f22d07 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 a4462019611caa4f69247c8bf94404a7  userguide.html.tgz
-1ca45eddd3590fb525085761e75a4ebd  pl-5.10.5.tar.gz
-2a0898b96c3fd5c8de334c1811b81431  SWI-Prolog-5.10.5.pdf
+a4ea80195b4e1dc63dc1b2c82a59a088  pl-6.0.1.tar.gz
+3e99fa623c6d186b4e9271a3a43d88a8  SWI-Prolog-6.0.1.pdf