diff --git a/.gitignore b/.gitignore index be041ea..fbf5f87 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /polyml.5.5.2.tar.gz /v5.6.tar.gz /v5.7.tar.gz +/polyml-5.7.1.tar.gz diff --git a/polyml-crowbar.patch b/polyml-crowbar.patch deleted file mode 100644 index 29b1b76..0000000 --- a/polyml-crowbar.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libpolyml/processes.cpp.orig 2017-03-22 11:51:06.000000000 -0600 -+++ libpolyml/processes.cpp 2017-08-19 16:15:49.545151184 -0600 -@@ -1885,7 +1885,7 @@ void Processes::CrowBarFn(void) - #if (defined(HAVE_PTHREAD) || defined(HAVE_WINDOWS_H)) - shutdownLock.Lock(); - crowbarRunning = true; -- if (crowbarLock.WaitFor(&shutdownLock, 20000)) // Wait for 20s -+ if (crowbarLock.WaitFor(&shutdownLock, 200000)) // Wait for 200s - { - // We've been woken by the main thread. Let it do the shutdown. - crowbarStopped.Signal(); diff --git a/polyml.spec b/polyml.spec index 2ba95a0..b7a6986 100644 --- a/polyml.spec +++ b/polyml.spec @@ -2,16 +2,13 @@ %undefine _hardened_build Name: polyml -Version: 5.7 -Release: 3%{?dist} +Version: 5.7.1 +Release: 1%{?dist} Summary: Poly/ML compiler and runtime system License: LGPLv2+ URL: http://www.polyml.org/ -Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz - -# Increase the main thread timeout, which is often reached on koji builders -Patch0: %{name}-crowbar.patch +Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz # The standard solution to kill the libtool-induced RPATH is to edit the # libtool script to kill it. However, that causes problems for us as we need @@ -33,9 +30,6 @@ BuildRequires: libXt-devel Requires: gcc-c++ Requires: polyml-libs%{?_isa} = %{version}-%{release} -# list of supported arches from configure.ac -ExclusiveArch: %{ix86} x86_64 sparc sparcv8 sparcv9 sparcv9v ppc %{power64} %{arm} aarch64 ia64 mips mipsel - %description Poly/ML is a full implementation of Standard ML available as open-source. This release supports the ML97 version of the language @@ -56,7 +50,9 @@ Runtime libraries for Poly/ML. %prep %setup -q -%patch0 + +# Fix end of line encoding +sed -i 's/\r//' documentation/main.css %build # Some hand-coded assembler is included. Because it does not contain an @@ -110,6 +106,11 @@ make check %{_libdir}/libpolyml.so.* %changelog +* Fri Dec 29 2017 Jerry James - 5.7.1-1 +- New upstream version +- Drop upstreamed -crowbar patch +- Drop ExclusiveArch tag; all Fedora arches are now supported + * Sat Aug 19 2017 Jerry James - 5.7-3 - Added -crowbar patch to make timeouts while building less likely diff --git a/sources b/sources index be7172e..2931aa0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.7.tar.gz) = c1a85720b79c1b6a0be8f7bcf35ff18215f918e1eb6819a6f154f96ae7e1a3a878fe01a80c5d614892792f27f7577530dafb4d684e710e82f8bf68bd55da2c2e +SHA512 (polyml-5.7.1.tar.gz) = 0b597f2fc9a68b764d4621e4e6b9c69083181bdfae66f53d0033bfc9661b9c42d252a42a72123245e8a55176a673d5343d6dd7936ae806d330b5e2b81f35e4d6