[yap] 6.2.2 bump

Fri Dec 9 13:29:07 UTC 2011

commit 1085e27b3badaec03ba8249177bd938adcc24cb0
Author: Petr Písař <ppisar at redhat.com>
Date:   Fri Dec 9 14:22:16 2011 +0100

    6.2.2 bump

 .gitignore                                |    1 +
 sources                                   |    2 +-
 yap-6.2.0-fix-chr-install-from-Keri.patch |  106 -----------------------------
 yap-6.2.0-ppc-mmap-addr.patch             |   11 ---
 yap.spec                                  |   43 +++++-------
 5 files changed, 19 insertions(+), 144 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 318a656..6225908 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ chr_translate_bootstrap2.pl
 chr_translate.pl
 guard_entailment.pl
 /yap-6.2.0.tar.gz
+/yap-6.2.2.tar.gz
diff --git a/sources b/sources
index ca55625..cf4d846 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df250bab67a7576ac9293f78156d4ee0  yap-6.2.0.tar.gz
+5010225464ffe8b2aa3e0bca9d935937  yap-6.2.2.tar.gz
diff --git a/yap.spec b/yap.spec
index 9c7687a..9602157 100644
--- a/yap.spec
+++ b/yap.spec
@@ -3,8 +3,8 @@
 %global use_eam 0
 
 Name:       yap
-Version:    6.2.0
-Release:    6%{?dist}
+Version:    6.2.2
+Release:    1%{?dist}
 Summary:    High-performance Prolog Compiler
 Group:      Development/Languages
 # README                            Perl Artistic license 2 and the FSF's LGPL
@@ -14,8 +14,8 @@ Group:      Development/Languages
 # packages/clib/sha1/sha2.c                 BSD or GPL
 # packages/http/examples/demo_threads.pl    GPLv2+
 License:    Artistic 2.0 and LGPLv2+ and (BSD or GPL+) and (GPLv2+)
-URL:        http://www.ncc.up.pt/~vsc/Yap
-Source:     http://www.ncc.up.pt/~vsc/Yap/%{name}-%{version}.tar.gz
+URL:        http://www.ncc.up.pt/~vsc/Yap/
+Source:     %{url}%{name}-%{version}.tar.gz
 Patch1:     Yap-noni386.patch
 Patch2:     yap-6.2.0-Locate-mysql-by-mysql_config.patch
 Patch3:     yap-6.2.0-Install-directory-for-info-pages.patch
@@ -23,15 +23,10 @@ Patch4:     yap-6.2.0-Install-http-CSS-files-into-PLTARGET.patch
 Patch5:     yap-6.2.0-Do-not-install-README-etc.patch
 Patch6:     yap-6.2.0-Install-info-pages-non-executable.patch
 Patch7:     yap-6.2.0-Do-not-install-info-dir-index.patch
-# In upstream already
-Patch8:     yap-6.2.0-fix-chr-install-from-Keri.patch
 # fix non-x86 build with recent gcc
-Patch9:     yap-6.2.0-gprof-macro.patch
-# Fix segfaults on PPC. Taken from Gentoo yap-6.2.0-gentoo-patchset-5.tar.gz
-Patch10:    yap-6.2.0-ppc-mmap-addr.patch
+Patch8:     yap-6.2.0-gprof-macro.patch
 # Fix compilation of PLStream package on PPC
-Patch11:    yap-6.2.0-Remove-feature-macro.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch9:     yap-6.2.0-Remove-feature-macro.patch
 BuildRequires:  autoconf
 BuildRequires:  gmp-devel
 BuildRequires:  mysql-devel
@@ -76,7 +71,7 @@ Documentation for Yap.
 
 
 %prep
-%setup -q -n %{name}-6
+%setup -q
 %patch1 -p1
 %patch2 -p1 -b .mysql_config
 %patch3 -p1 -b .install_info_directory
@@ -84,16 +79,16 @@ Documentation for Yap.
 %patch5 -p1 -b .do_not_install_readme
 %patch6 -p1 -b .non_executable_info
 %patch7 -p1 -b .do_not_install_info_index
-%patch8 -p1 -b .fix_chr_install
-%patch9 -p1 -b .macro
-%patch10 -p1 -b .ppc
-%patch11 -p1 -b .remove_feature_macro
+%patch8 -p1 -b .macro
+%patch9 -p1 -b .remove_feature_macro
 
 # remove redundant RPATH
 sed -i 's/-Wl,-R\(,\)\{0,1\}\\$(LIBDIR)//' configure.in
 # transform RPATH into RUN_PATH. Private libraries dlopen()ed depend each on
 # other
 sed -i 's/-Wl,-R/-Wl,--enable-new-dtags,-R/g' configure.in
+# Add soname to library
+sed -i -e 's/\(-soname=\$DYNYAPLIB\)/\1.%{version}/' configure.in
 
 # Regerenate configure because of patching
 autoconf
@@ -103,7 +98,7 @@ autoconf
 
 # Add soname to library and symlink from unversioned to versioned one
 sed -i \
-    -e '/@YAPLIB_LD@/ s/\(-o @YAPLIB@\)\(.*\)/-Wl,-soname=@YAPLIB at .%{version} \1.%{version}\2\n\tln -s @YAPLIB at .%{version} @YAPLIB@/' \
+    -e '/@YAPLIB_LD@/ s/\(-o @YAPLIB@\)\(.*\)/\1.%{version}\2\n\tln -s @YAPLIB at .%{version} @YAPLIB@/' \
     -e '/@INSTALL_DLLS at .* @YAPLIB@/ s/\(@YAPLIB@\)\(.*\)/\1.%{version}\2\n\t at LN_S@ @YAPLIB at .%{version} $(DESTDIR)$(LIBDIR)\/@YAPLIB@/' \
     Makefile.in
 
@@ -115,6 +110,7 @@ for F in README changes.css; do
 done
 for F in docs/yap.tex TO_DO; do
     iconv -f iso-8859-1 -t utf-8 < "$F" > "${F}.new"
+    sed -i -e '/mode: texinfo/ s/\(coding: \)latin-1/\1utf-8/' "${F}.new"
     touch -r "$F"{,.new}
     mv "$F"{.new,}
 done
@@ -146,7 +142,6 @@ make %{?_smp_mflags} info
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %ifarch ppc ppc64
 ulimit -s unlimited
 %endif
@@ -205,13 +200,8 @@ fi
 /sbin/ldconfig
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
-%doc Artistic changes* COPYING README TO_DO
+%doc Artistic changes* COPYING GIT README TO_DO
 %if %{use_eam}
 %doc README.EAM.html
 %endif
@@ -223,19 +213,20 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/libYap.so
 %{_includedir}/Yap
 
 
 %files docs
-%defattr(-,root,root,-)
 %doc LGPL/pillow/doc/pillow_doc_html/*
 %doc LGPL/pillow/doc/article.ps.gz
 %doc %{documentation}/*
 
 
 %changelog
+* Fri Dec 09 2011 Petr Pisar <ppisar at redhat.com> - 6.2.2-1
+- 6.2.2 bump
+
 * Wed Dec 07 2011 Petr Pisar <ppisar at redhat.com> - 6.2.0-6
 - Fix building on PowerPC (bug #751144)
 
