[linbox] Only s390 needs the size_t fix

[Dan Horák]

commit 91798eeb3ce5e1e38a4ce3ba039638ede0a0f429
Author: Dan Horák <dan at danny.cz>
Date:   Wed Jan 2 11:22:17 2013 +0100

    Only s390 needs the size_t fix

 linbox-size_t.patch |    4 ++--
 linbox.spec         |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/linbox-size_t.patch b/linbox-size_t.patch
index 228e775..84c223c 100644
--- a/linbox-size_t.patch
+++ b/linbox-size_t.patch
@@ -7,7 +7,7 @@ diff -up linbox-1.3.2/linbox/matrix/blas-matrix.h.size_t linbox-1.3.2/linbox/mat
  		// might be useful to add signed type either but need to resolve conflict with pathch version above for GCC-4.4.5
 -#ifdef __APPLE__
 +		// Dan Horak: also fixes case where size_t is defined as unsigned long (eg. on s390)
-+#if defined(__APPLE__) || defined(__s390__)
++#if defined(__APPLE__) || (defined(__s390__) && !defined(__s390x__))
  
  		template<class T>
  		BlasMatrix (const _Field &F, const unsigned long &m, const T &n) ;
@@ -19,7 +19,7 @@ diff -up linbox-1.3.2/linbox/matrix/blas-matrix.inl.size_t linbox-1.3.2/linbox/m
  #endif
  
 -#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__s390__)
++#if defined(__APPLE__) || (defined(__s390__) && !defined(__s390x__))
  	template <class _Field>
  	template<class T>
  	BlasMatrix< _Field>::BlasMatrix (const _Field &F, const unsigned long & m, const T& n) :
diff --git a/linbox.spec b/linbox.spec
index 22dd9ad..d3de793 100644
--- a/linbox.spec
+++ b/linbox.spec
@@ -1,6 +1,6 @@
 Name:           linbox
 Version:        1.3.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        C++ Library for High-Performance Exact Linear Algebra
 Group:          Development/Libraries
 License:        LGPLv2+
@@ -141,6 +141,9 @@ LD_LIBRARY_PATH=`pwd`/linbox/.libs make %{?_smp_mflags} check
 
 
 %changelog
+* Wed Jan  2 2013 Dan Horák <dan[at]danny.cz> - 1.3.2-8
+- Only s390 needs the size_t fix
+
 * Tue Jan  1 2013 Dan Horák <dan[at]danny.cz> - 1.3.2-7
 - Fix build when size_t is unsigned long (eg. on s390)