[Macaulay2: 2/2] Merge branch 'f20'

[Rex Dieter]

commit c1c0fceafb5dc4992474f04dab3b352934da87b6
Merge: ece3075 31cb527
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Jan 17 07:53:49 2014 -0600

    Merge branch 'f20'

 Macaulay2.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc Macaulay2.spec
index f271f4b,376c3f3..39f78cc
--- a/Macaulay2.spec
+++ b/Macaulay2.spec
@@@ -18,11 -18,11 +18,14 @@@ URL:     http://www.math.uiuc.edu/Macau
  Source0: http://www.math.uiuc.edu/Macaulay2/Downloads/SourceCode/Macaulay2-%{version}-%{svn}-src.tar.bz2
  #Source0: Macaulay2-1.5-%{svn}.tar.xz
  Source1: Macaulay2-svn_checkout.sh
 +# TEMPORARY: remove this when Macaulay ships the updated version
 +Source2: Normaliz.m2
 +
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
+ # In particular, Singular FTBFS on arm
+ ExclusiveArch: %{ix86} x86_64
+ 
  Source10: Macaulay2.png
  Source11: Macaulay2.desktop
  Source20: etags.sh