[yap] Make 6.2.0 prepable

[Petr Pisar]

commit 44d9ae060b68a53ea2ed6d80be72893efe223b31
Author: Petr Písař <ppisar at redhat.com>
Date:   Mon Dec 20 18:35:59 2010 +0100

    Make 6.2.0 prepable

 Yap-5.1.1-config.sub.patch | 1059 --------------------------------------------
 Yap-creat.patch            |   21 -
 yap.spec                   |   49 +-
 3 files changed, 24 insertions(+), 1105 deletions(-)
---
diff --git a/yap.spec b/yap.spec
index d473a18..587210e 100644
--- a/yap.spec
+++ b/yap.spec
@@ -1,19 +1,16 @@
 Name:       yap
-Version:    5.1.3
-Release:    4%{?dist}
+Version:    6.2.0
+Release:    1%{?dist}
 Summary:    High-performance Prolog Compiler
 Group:      Development/Languages
 License:    Artistic 2.0 or LGPLv2+
 URL:        http://www.ncc.up.pt/~vsc/Yap
-Source:     http://www.ncc.up.pt/~vsc/Yap/current/Yap-%{version}.tar.gz
+Source:     http://www.ncc.up.pt/~vsc/Yap/current/%{name}-%{version}.tar.gz
 Source1:    guard_entailment.pl
 Source2:    chr_translate_bootstrap1.pl
 Source3:    chr_translate_bootstrap2.pl
 Source4:    chr_translate.pl
 Patch1:     Yap-noni386.patch
-Patch2:     Yap-creat.patch
-# config.sub in the tarball is too old for ppc64
-Patch3:     Yap-5.1.1-config.sub.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel, gmp-devel, texinfo
 Requires(post):   /sbin/install-info, /sbin/ldconfig
@@ -47,13 +44,12 @@ Documentation for Yap.
 
 
 %prep
-%setup -q -n Yap-%{version}
+%setup -q -n %{name}-6
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 find -name CVS -print0 | xargs -0 rm -rf
-cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} LGPL/chr
+# chr and clpqr are optional and they are a copy from SWI Prolog
+#cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} LGPL/chr
 
 # remove redundant rpath
 sed -i '/-Wl,-R/d' configure
@@ -65,20 +61,20 @@ sed -i 's/@DYNLIB_LD@/@DYNLIB_LD@ -Wl,-soname=@YAPLIB at .%{version} /g' Makefile.i
 find -name Makefile.in | xargs sed -i 's|$(ROOTDIR)/lib|$(ROOTDIR)/%{_lib}|'
 find -name Makefile.in | xargs sed -i 's|$(EROOTDIR)/lib|$(EROOTDIR)/%{_lib}|'
 
-# Hack LGPL/chr build environment to run just build interpreter
-# yap-6.2.0 have those SWI compatible libraries optional and separate. Package
-# them as standalone package in the future and remove this ugly thing:
-# Provide path to just built library and libc bindings
-sed -i '/LGPL\/chr/ s|\(make install\)|LD_LIBRARY_PATH='"${PWD}:${PWD}/library/system"' \1|' Makefile.in
-# Provide paths to Prolog libraries
-mkdir -p LGPL/chr/usr/share && ln -s ../../../../library LGPL/chr/usr/share/Yap
-mkdir -p library/usr/share && ln -s ../.. library/usr/share/Yap
-# Provide paths to parent Prolog libraries
-ln -s {../LGPL,library}/maplist.pl
-ln -s {../GPL,library}/aggregate.pl
-ln -s {../GPL,library}/occurs.yap
-ln -s {../GPL,library}/pairs.pl
-ln -s {../GPL,library}/error.pl
+## Hack LGPL/chr build environment to run just build interpreter
+## yap-6.2.0 have those SWI compatible libraries optional and separate. Package
+## them as standalone package in the future and remove this ugly thing:
+## Provide path to just built library and libc bindings
+#sed -i '/LGPL\/chr/ s|\(make install\)|LD_LIBRARY_PATH='"${PWD}:${PWD}/library/system"' \1|' Makefile.in
+## Provide paths to Prolog libraries
+#mkdir -p LGPL/chr/usr/share && ln -s ../../../../library LGPL/chr/usr/share/Yap
+#mkdir -p library/usr/share && ln -s ../.. library/usr/share/Yap
+## Provide paths to parent Prolog libraries
+#ln -s {../LGPL,library}/maplist.pl
+#ln -s {../GPL,library}/aggregate.pl
+#ln -s {../GPL,library}/occurs.yap
+#ln -s {../GPL,library}/pairs.pl
+#ln -s {../GPL,library}/error.pl
 
 # Fix file encoding
 for F in README changes.css; do
@@ -169,8 +165,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Dec 20 2010 Petr Pisar <ppisar at redhat.com> - 5.1.3-4
+* Mon Dec 20 2010 Petr Pisar <ppisar at redhat.com> - 6.2.0-1
 - Reorder metadata in spec file
+- 6.2.0 bump
+- Remove uneeded Yap-creat.patch
+- Remove uneeded Yap-5.1.1-config.sub.patch
 
 * Wed Dec 08 2010 Petr Pisar <ppisar at redhat.com> - 5.1.3-3
 - Hack SWI-compatible libraries build system to be compilable (bug #660965)