diff --git a/.gitignore b/.gitignore index 3ced2d0..8e45ca9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ SuiteSparse-3.4.0.tar.gz +/SuiteSparse-3.6.0.tar.gz diff --git a/sources b/sources index 1e4f6df..5342f78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e59dcabc9173b1ba1b3659ae147006b8 SuiteSparse-3.4.0.tar.gz +8ccb9e90b478b5d55b1d9a794e8ed676 SuiteSparse-3.6.0.tar.gz diff --git a/suitesparse_build.patch b/suitesparse-fedora-build-config.patch similarity index 72% rename from suitesparse_build.patch rename to suitesparse-fedora-build-config.patch index 069ba22..2e6de68 100644 --- a/suitesparse_build.patch +++ b/suitesparse-fedora-build-config.patch @@ -1,6 +1,6 @@ ---- UFconfig/UFconfig.mk 2008-09-22 14:19:37.000000000 -0400 -+++ UFconfig/UFconfig.mk.new 2008-12-20 21:18:19.000000000 -0500 -@@ -48,7 +48,7 @@ +--- 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) @@ -9,18 +9,20 @@ F77FLAGS = -O F77LIB = -@@ -89,13 +89,17 @@ - # BLAS = -lgoto -lgfortran -lgfortranbegin -lg2c +@@ -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 -lgfortranbegin -lg2c +-BLAS = -lblas -lgfortran -LAPACK = -llapack -+#BLAS = -lblas -lgfortran -lgfortranbegin -lg2c ++#BLAS = -lblas -lgfortran +#LAPACK = -llapack - # Using non-optimized versions: - # BLAS = -lblas_plain -lgfortran -lgfortranbegin -lg2c - # LAPACK = -llapack_plain + # 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 @@ -29,7 +31,7 @@ # 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 -@@ -146,7 +150,7 @@ +@@ -156,7 +160,7 @@ # -DNRECIPROCAL do not multiply by the reciprocal # -DNO_DIVIDE_BY_ZERO do not divide by zero @@ -38,7 +40,7 @@ #------------------------------------------------------------------------------ # CHOLMOD configuration -@@ -184,7 +188,7 @@ +@@ -194,7 +198,7 @@ # -DNSUNPERF for Solaris only. If defined, do not use the Sun # Performance Library @@ -47,7 +49,7 @@ #------------------------------------------------------------------------------ # SuiteSparseQR configuration: -@@ -198,7 +202,7 @@ +@@ -208,7 +212,7 @@ # -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB) # default, without timing, without TBB: @@ -56,7 +58,7 @@ # with timing and TBB: # SPQR_CONFIG = -DTIMING -DHAVE_TBB # with timing -@@ -263,6 +267,10 @@ +@@ -280,6 +284,10 @@ # F77 = gfortran # BLAS = -lgoto -lgfortran @@ -65,5 +67,5 @@ +BLAS = -lf77blas -lgfortran + #------------------------------------------------------------------------------ - # Solaris + # Mac #------------------------------------------------------------------------------ diff --git a/suitesparse.spec b/suitesparse.spec index 6004dcd..f5b02d6 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -1,13 +1,13 @@ Name: suitesparse -Version: 3.4.0 -Release: 2%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Summary: A collection of sparse matrix libraries Group: System Environment/Libraries -License: LGPLv2+ +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 -Patch0: suitesparse_build.patch +Patch0: suitesparse-fedora-build-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atlas-devel @@ -76,30 +76,32 @@ This package contains documentation files for %{name}. %patch0 -p0 -b .build %build -%define amd_version 2.2.0 +%define amd_version 2.2.2 %define amd_version_major 2 -%define btf_version 1.1.0 +%define btf_version 1.1.2 %define btf_version_major 1 -%define camd_version 2.2.0 +%define camd_version 2.2.2 %define camd_version_major 2 -%define ccolamd_version 2.7.1 +%define ccolamd_version 2.7.3 %define ccolamd_version_major 2 -%define cholmod_version 1.7.1 +%define cholmod_version 1.7.3 %define cholmod_version_major 1 -%define colamd_version 2.7.1 +%define colamd_version 2.7.3 %define colamd_version_major 2 %define csparse_version 2.2.3 %define csparse_version_major 2 %define cxsparse_version 2.2.3 %define cxsparse_version_major 2 -%define klu_version 1.1.0 +%define klu_version 1.1.3 %define klu_version_major 1 -%define ldl_version 2.0.1 +%define ldl_version 2.0.3 %define ldl_version_major 2 -%define umfpack_version 5.4.0 +%define umfpack_version 5.5.1 %define umfpack_version_major 5 -%define spqr_version 1.1.2 +%define spqr_version 1.2.1 %define spqr_version_major 1 +%define rbio_version 2.0.1 +%define rbio_version_major 2 ### CHOLMOD can also be compiled to use the METIS library, but it is not ### used here because its licensing terms exclude it from Fedora Extras. ### To compile with METIS, define enable_metis as 1 below. @@ -110,7 +112,7 @@ This package contains documentation files for %{name}. ### enable_csparse as 1 below. %define enable_csparse 0 -mkdir -p Doc/{AMD,BTF,CAMD,CCOLAMD,CHOLMOD,COLAMD,KLU,LDL,UMFPACK,SPQR} Lib Include +mkdir -p Doc/{AMD,BTF,CAMD,CCOLAMD,CHOLMOD,COLAMD,KLU,LDL,UMFPACK,SPQR,RBio} Lib Include pushd AMD pushd Lib @@ -320,6 +322,21 @@ pushd SPQR cp -p README_SPQR.txt Doc/* ../Doc/SPQR popd +pushd RBio + pushd Lib + make CFLAGS="$RPM_OPT_FLAGS -fPIC" + popd + pushd ../Lib + gcc -shared -Wl,-soname,librbio.so.%{rbio_version_major} -o \ + librbio.so.%{rbio_version} ../RBio/Lib/*.o + ln -sf librbio.so.%{rbio_version} librbio.so.%{rbio_version_major} + ln -sf librbio.so.%{rbio_version} librbio.so + cp -p ../RBio/Lib/*.a ./ + popd + cp -p Include/*.h ../Include + cp -p README.txt Doc/ChangeLog Doc/License.txt ../Doc/RBio +popd + cp -p UFconfig/UFconfig.h Include %install @@ -364,6 +381,9 @@ rm -rf ${RPM_BUILD_ROOT} %doc Doc/* %changelog +* Fri Feb 04 2011 Deji Akingunola - 3.6.0-1 +- Update to 3.6.0 + * Sun Jul 26 2009 Fedora Release Engineering - 3.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild