[Macaulay2] Revert Apr 8 HTML creation timeout, now handled upstream. Revert use of -common subpkg; various arch

[Jerry James]

commit d81429637f29714716bf9876d4b751aaa0aa88dd
Author: Jerry James <loganjerry at gmail.com>
Date:   Wed Oct 29 19:32:01 2014 -0600

    Revert Apr 8 HTML creation timeout, now handled upstream.
    Revert use of -common subpkg; various arches timeout differently.

 Macaulay2.spec |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/Macaulay2.spec b/Macaulay2.spec
index 3ed00d8..a71958b 100644
--- a/Macaulay2.spec
+++ b/Macaulay2.spec
@@ -4,7 +4,7 @@
 %global emacs_sitelisp  %{_datadir}/emacs/site-lisp/
 %global xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp/
 ## define to create -common subpkg
-%global common 1
+#global common 1
 #if 0%{?fedora} > 20
 # use system normaliz
 %global system_normaliz 1
@@ -207,10 +207,6 @@ fi
 done
 popd
 
-# Increase timeouts for slower CPUs (e.g., ARM)
-sed -i.timeout 's/-t 700/-t 1500/' Macaulay2/m2/html.m2
-touch -r Macaulay2/m2/html.m2.timeout Macaulay2/m2/html.m2
-
 
 %build
 
@@ -346,9 +342,10 @@ fi
 
 
 %changelog
-* Wed Sep 24 2014 Jerry James <loganjerry at gmail.com> - 1.6-7
+* Wed Oct 29 2014 Jerry James <loganjerry at gmail.com> - 1.6-7
 - Rebuild for ntl 6.2.1
-- Fix timeout increase for building HTML files
+- Revert Apr 8 HTML creation timeout, now handled upstream
+- Revert use of -common subpkg; various arches timeout differently
 
 * Wed Sep 24 2014 Rex Dieter <rdieter at fedoraproject.org> 1.6-6
 - enable -common subpkg (to be more compatible with upstream packaging)