diff --git a/sources b/sources index 7fdb1dd..dee424e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8f26a3b1c7f82444c0db0b375215287 SuiteSparse-4.3.1.tar.gz +e0af74476935c9ff6d971df8bb6b82fc SuiteSparse-4.4.4.tar.gz diff --git a/suitesparse-fedora-build-config.patch b/suitesparse-fedora-build-config.patch deleted file mode 100644 index 2e6de68..0000000 --- a/suitesparse-fedora-build-config.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- UFconfig/UFconfig.mk 2011-01-26 14:49:41.000000000 -0500 -+++ UFconfig/UFconfig.mk.new 2011-02-04 10:12:02.201378469 -0500 -@@ -49,7 +49,7 @@ - MV = mv -f - - # Fortran compiler (not normally required) --F77 = f77 -+F77 = gfortran - F77FLAGS = -O - F77LIB = - -@@ -91,8 +91,8 @@ - # naming the BLAS and LAPACK library (*.a or *.so) files. - - # This is probably slow ... it might connect to the Standard Reference BLAS: --BLAS = -lblas -lgfortran --LAPACK = -llapack -+#BLAS = -lblas -lgfortran -+#LAPACK = -llapack - - # NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto" - # statement. Rather, the Goto BLAS is written by Dr. Kazushige Goto. -@@ -106,6 +106,10 @@ - # BLAS = -lblas_plain -lgfortran -lgfortranbegin - # LAPACK = -llapack - -+# Using ATLAS optimized BLAS and Lapack: Fedora specific addition -+BLAS = -lcblas -+LAPACK = -lclapack -+ - # The BLAS might not contain xerbla, an error-handling routine for LAPACK and - # the BLAS. Also, the standard xerbla requires the Fortran I/O library, and - # stops the application program if an error occurs. A C version of xerbla -@@ -156,7 +160,7 @@ - # -DNRECIPROCAL do not multiply by the reciprocal - # -DNO_DIVIDE_BY_ZERO do not divide by zero - --UMFPACK_CONFIG = -+UMFPACK_CONFIG = -DNPARTITION - - #------------------------------------------------------------------------------ - # CHOLMOD configuration -@@ -194,7 +198,7 @@ - # -DNSUNPERF for Solaris only. If defined, do not use the Sun - # Performance Library - --CHOLMOD_CONFIG = -+CHOLMOD_CONFIG = -DNPARTITION - - #------------------------------------------------------------------------------ - # SuiteSparseQR configuration: -@@ -208,7 +212,7 @@ - # -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB) - - # default, without timing, without TBB: --SPQR_CONFIG = -+SPQR_CONFIG = -DNPARTITION - # with timing and TBB: - # SPQR_CONFIG = -DTIMING -DHAVE_TBB - # with timing -@@ -280,6 +284,10 @@ - # F77 = gfortran - # BLAS = -lgoto -lgfortran - -+# Fedora, with ATLAS Blas -+F77 = gfortran -+BLAS = -lf77blas -lgfortran -+ - #------------------------------------------------------------------------------ - # Mac - #------------------------------------------------------------------------------ diff --git a/suitesparse-math.patch b/suitesparse-math.patch deleted file mode 100644 index b5178f0..0000000 --- a/suitesparse-math.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up SuiteSparse/SuiteSparse_config/SuiteSparse_config.c.math SuiteSparse/SuiteSparse_config/SuiteSparse_config.c ---- SuiteSparse/SuiteSparse_config/SuiteSparse_config.c.math 2014-03-21 13:15:22.000000000 -0600 -+++ SuiteSparse/SuiteSparse_config/SuiteSparse_config.c 2014-09-15 16:53:50.243297000 -0600 -@@ -9,6 +9,7 @@ - * Author: Timothy A. Davis. - */ - -+#include - #include - - #ifndef NPRINT -diff -up SuiteSparse/SuiteSparse_config/SuiteSparse_config.h.math SuiteSparse/SuiteSparse_config/SuiteSparse_config.h ---- SuiteSparse/SuiteSparse_config/SuiteSparse_config.h.math 2014-07-16 15:35:20.000000000 -0600 -+++ SuiteSparse/SuiteSparse_config/SuiteSparse_config.h 2014-09-15 16:23:31.802267503 -0600 -@@ -44,7 +44,6 @@ extern "C" { - - #include - #include --#include - - /* ========================================================================== */ - /* === SuiteSparse_long ===================================================== */ diff --git a/suitesparse.spec b/suitesparse.spec index e6f8226..3b67571 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -11,17 +11,14 @@ %endif Name: suitesparse -Version: 4.3.1 -Release: 5%{?dist} +Version: 4.4.4 +Release: 1%{?dist} Summary: A collection of sparse matrix libraries Group: System Environment/Libraries License: LGPLv2+ and GPLv2+ -URL: http://www.cise.ufl.edu/research/sparse/SuiteSparse -Source0: http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-%{version}.tar.gz -# Move #include out of StuiteSparse_config.h and into SuiteSparse_config.c -Patch0: suitesparse-math.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: http://faculty.cse.tamu.edu/davis/suitesparse.html +Source0: http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-%{version}.tar.gz %if %{with atlas310} BuildRequires: atlas-devel >= 3.10 @@ -95,7 +92,6 @@ This package contains documentation files for %{name}. %prep %setup -q -n SuiteSparse -%patch0 -p1 -b .math %build %define amd_version 2.4.0 @@ -441,6 +437,11 @@ rm -rf ${RPM_BUILD_ROOT} %doc Doc/* %changelog +* Wed Jun 10 2015 Nils Philippsen - 4.4.4-1 +- version 4.4.4 +- fix URLs +- remove obsolete patches + * Sat May 02 2015 Kalev Lember - 4.3.1-5 - Rebuilt for GCC 5 C++11 ABI change