[polyml] New upstream release.

[Jerry James]

commit 4c7a59bb2b585723826af6cc6ff74392969e8997
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Aug 8 20:03:30 2011 -0600

    New upstream release.

 .gitignore            |    4 ++--
 polyml-sem-wait.patch |   23 ++++++++++++++++++++---
 polyml.spec           |   18 +++++++++++-------
 sources               |    2 +-
 4 files changed, 34 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0c7eb4e..97b19f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-polyml.5.4.tar.gz
-polyml-docs.tar.xz
+/polyml-docs.tar.xz
+/polyml.5.4.1.tar.gz
diff --git a/polyml-sem-wait.patch b/polyml-sem-wait.patch
index 4fedbb7..45c3b4e 100644
--- a/polyml-sem-wait.patch
+++ b/polyml-sem-wait.patch
@@ -1,11 +1,28 @@
 --- configure.orig	2010-09-03 05:22:40.000000000 -0600
-+++ configure	2011-02-03 13:12:04.687175621 -0700
-@@ -16429,7 +16429,7 @@
++++ configure	2011-08-08 11:43:53.846348240 -0600
+@@ -16423,13 +16423,13 @@
+ if test "x$ac_cv_func_sem_wait" = x""yes; then :
+ 
+ else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sem_wait in -lrt" >&5
+-$as_echo_n "checking for sem_wait in -lrt... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sem_wait in -lpthread" >&5
++$as_echo_n "checking for sem_wait in -lpthread... " >&6; }
+ if test "${ac_cv_lib_rt_sem_wait+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lrt  $LIBS"
-+LIBS="-lrt -lpthread $LIBS"
++LIBS="-lpthread $LIBS"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
+@@ -16464,7 +16464,7 @@
+ #define HAVE_LIBRT 1
+ _ACEOF
+ 
+-  LIBS="-lrt $LIBS"
++  LIBS="-lpthread $LIBS"
+ 
+ fi
+ 
diff --git a/polyml.spec b/polyml.spec
index 6691cec..04e4ca5 100644
--- a/polyml.spec
+++ b/polyml.spec
@@ -1,18 +1,17 @@
 Name:           polyml
-Version:        5.4
-Release:        3%{?dist}
+Version:        5.4.1
+Release:        1%{?dist}
 Summary:        Poly/ML compiler and runtime system
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.polyml.org
-Source0:        http://downloads.sourceforge.net/polyml/polyml/%{version}/polyml.%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/polyml/polyml.%{version}.tar.gz
 # 2011-02-03 snapshot of http://www.polyml.org/docs/.
 Source1:        polyml-docs.tar.xz
 # This patch has not yet been sent upstream.  The shipped configure script
 # looks in -lrt for sem_wait, and concludes that we don't have it.  We do,
-# but it is in -lpthread.  We fudge the configure test, since we'll link with
-# both libraries anyway.
+# but it is in -lpthread.
 Patch0:         polyml-sem-wait.patch
 
 # The standard solution to kill the libtool-induced RPATH is to edit the
@@ -29,8 +28,9 @@ BuildRequires:  lesstif-devel
 BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
 BuildRequires:  libXt-devel
-Requires:       polyml-libs = %{version}-%{release}
+Requires:       polyml-libs%{?_isa} = %{version}-%{release}
 
+# FIXME: Fix --with-portable build on other arches
 # list of supported arches from configure.ac
 ExclusiveArch: %{arm} %{ix86} x86_64 ia64 sparc sparcv9 ppc
 
@@ -43,6 +43,7 @@ and the Standard Basis Library.
 Summary:        Poly/ML documentation
 Group:          Development/Languages
 Requires:       polyml = %{version}-%{release}
+BuildArch:      noarch
 
 %description doc
 Documentation for Poly/ML.
@@ -67,7 +68,7 @@ Runtime libraries for Poly/ML.
 # SELinux.  The execstack flag is not really needed, so we go through the
 # contortions below to keep it off.
 %configure --disable-static \
-%ifnarch %{ix86} sparcv9 sparcv9v ppc x86_64 amd64 armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l ia64
+%ifnarch %{arm} %{ix86} x86_64 ia64 sparc sparcv9 ppc
   --with-portable \
 %endif
   CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -Wa,--noexecstack" \
@@ -109,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpolyml.so.*
 
 %changelog
+* Mon Aug  8 2011 Jerry James <loganjerry at gmail.com> - 5.4.1-1
+- New upstream release
+
 * Fri Apr 29 2011 Dan Horák <dan[at]danny.cz> - 5.4-3
 - updated the supported arch list
 
diff --git a/sources b/sources
index 4902fd2..8a374d5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ce9929514f5b302a31dff769ccfbcd02  polyml.5.4.tar.gz
+a06ba2bee454ebdda06c1b61f638f45e  polyml.5.4.1.tar.gz
 853a980efa35036023c398d108021b53  polyml-docs.tar.xz