diff --git a/.cvsignore b/.cvsignore index d208116..3b4c813 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -SuiteSparse-3.2.0.tar.gz +SuiteSparse-3.3.0.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..a134f2b --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +suitesparse-3_3_0-1_fc11:HEAD:suitesparse-3.3.0-1.fc11.src.rpm:1241996720 diff --git a/sources b/sources index 6c06306..05bd7ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1be7abb6227568fec94179cb1300303 SuiteSparse-3.2.0.tar.gz +d739811057c301905c99279d87f3f6d4 SuiteSparse-3.3.0.tar.gz diff --git a/suitesparse.spec b/suitesparse.spec index 92c3a0b..b281674 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -1,6 +1,6 @@ Name: suitesparse -Version: 3.2.0 -Release: 6%{?dist} +Version: 3.3.0 +Release: 1%{?dist} Summary: A collection of sparse matrix libraries Group: System Environment/Libraries @@ -10,7 +10,7 @@ Source0: http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse- Patch0: suitesparse_build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: atlas-devel +BuildRequires: atlas-devel tbb-devel Obsoletes: umfpack <= 5.0.1 Obsoletes: ufsparse <= 2.1.1 Provides: ufsparse = %{version}-%{release} @@ -64,29 +64,29 @@ version of the suitesparse libraries. %patch0 -p0 -b .build %build -%define amd_version 2.2 +%define amd_version 2.2.0 %define amd_version_major 2 -%define btf_version 1.0.1 +%define btf_version 1.1.0 %define btf_version_major 1 %define camd_version 2.2.0 %define camd_version_major 2 %define ccolamd_version 2.7.1 %define ccolamd_version_major 2 -%define cholmod_version 1.7.0 +%define cholmod_version 1.7.1 %define cholmod_version_major 1 -%define colamd_version 2.7.0 +%define colamd_version 2.7.1 %define colamd_version_major 2 -%define csparse_version 2.2.2 +%define csparse_version 2.2.3 %define csparse_version_major 2 -%define cxsparse_version 2.2.2 +%define cxsparse_version 2.2.3 %define cxsparse_version_major 2 -%define klu_version 1.0.1 +%define klu_version 1.1.0 %define klu_version_major 1 -%define ldl_version 2.0.0 +%define ldl_version 2.0.1 %define ldl_version_major 2 -%define umfpack_version 5.2.0 +%define umfpack_version 5.3.0 %define umfpack_version_major 5 -%define spqr_version 1.1.0 +%define spqr_version 1.1.1 %define spqr_version_major 1 ### 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. @@ -353,6 +353,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/lib*.a %changelog +* Mon Apr 27 2009 Deji Akingunola - 3.3.0-1 +- Update to release 3.3.0. + * Wed Feb 25 2009 Fedora Release Engineering - 3.2.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/suitesparse_build.patch b/suitesparse_build.patch index 2179669..09efa3f 100644 --- a/suitesparse_build.patch +++ b/suitesparse_build.patch @@ -1,13 +1,3 @@ ---- SPQR/Include/spqr.hpp 2008-09-18 09:20:48.000000000 -0400 -+++ SPQR/Include/spqr.hpp.new 2008-12-20 21:05:49.000000000 -0500 -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - #include - typedef std::complex Complex ; --- 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 @@ @@ -62,7 +52,7 @@ # default, without timing, without TBB: -SPQR_CONFIG = -+SPQR_CONFIG = -DNPARTITION ++SPQR_CONFIG = -DHAVE_TBB -DNPARTITION # with timing and TBB: # SPQR_CONFIG = -DTIMING -DHAVE_TBB # with timing