From b546101b7330c555ccbb952efc307e8820cd9a06 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Tue, 27 Sep 2011 10:08:23 -0400 Subject: [PATCH 1/3] Update to 3.6.1 Fix undefine symbols in libspqr --- sources | 2 +- suitesparse.spec | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 5342f78..139c4ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ccb9e90b478b5d55b1d9a794e8ed676 SuiteSparse-3.6.0.tar.gz +88a44890e8f61cdbb844a76b7259d876 SuiteSparse-3.6.1.tar.gz diff --git a/suitesparse.spec b/suitesparse.spec index 6872f20..ce170e7 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -1,6 +1,6 @@ Name: suitesparse -Version: 3.6.0 -Release: 3%{?dist} +Version: 3.6.1 +Release: 1%{?dist} Summary: A collection of sparse matrix libraries Group: System Environment/Libraries @@ -315,7 +315,7 @@ pushd SPQR pushd ../Lib g++ -shared -Wl,-soname,libspqr.so.%{spqr_version_major} -o \ libspqr.so.%{spqr_version} ../SPQR/Lib/*.o \ - -L%{_libdir}/atlas -lcblas -llapack \ + -L%{_libdir}/atlas -L%{_libdir} -lcblas -llapack -ltbb -ltbbmalloc \ libcholmod.so.%{cholmod_version_major} -lm ln -sf libspqr.so.%{spqr_version} libspqr.so.%{spqr_version_major} ln -sf libspqr.so.%{spqr_version} libspqr.so @@ -397,6 +397,10 @@ rm -rf ${RPM_BUILD_ROOT} %doc Doc/* %changelog +* Fri Sep 23 2011 Deji Akingunola - 3.6.1-1 +- Update to 3.6.1 +- Fix undefine symbols in libspqr + * Sun Feb 13 2011 Deji Akingunola - 3.6.0-3 - Fix a couple of undefined reference errors in umfpack and Rbio (#677061) From 76fa9f3a48ec01f9c5be4689378affbf7a7c6afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 11 Oct 2011 11:42:08 +0200 Subject: [PATCH 2/3] fix build without TBB --- suitesparse.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/suitesparse.spec b/suitesparse.spec index ce170e7..eaf2279 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -1,6 +1,6 @@ Name: suitesparse Version: 3.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of sparse matrix libraries Group: System Environment/Libraries @@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atlas-devel %ifarch %{ix86} x86_64 ia64 BuildRequires: tbb-devel +%global with_tbb 1 %endif Obsoletes: umfpack <= 5.0.1 Obsoletes: ufsparse <= 2.1.1 @@ -306,16 +307,12 @@ popd pushd SPQR pushd Lib -%ifarch %{ix86} x86_64 ia64 - make CFLAGS="$RPM_OPT_FLAGS -DHAVE_TBB -DNPARTITION -fPIC" -%else - make CFLAGS="$RPM_OPT_FLAGS -DNPARTITION -fPIC" -%endif + make CFLAGS="$RPM_OPT_FLAGS %{?with_tbb:-DHAVE_TBB} -DNPARTITION -fPIC" popd pushd ../Lib g++ -shared -Wl,-soname,libspqr.so.%{spqr_version_major} -o \ libspqr.so.%{spqr_version} ../SPQR/Lib/*.o \ - -L%{_libdir}/atlas -L%{_libdir} -lcblas -llapack -ltbb -ltbbmalloc \ + -L%{_libdir}/atlas -L%{_libdir} -lcblas -llapack %{?with_tbb:-ltbb -ltbbmalloc} \ libcholmod.so.%{cholmod_version_major} -lm ln -sf libspqr.so.%{spqr_version} libspqr.so.%{spqr_version_major} ln -sf libspqr.so.%{spqr_version} libspqr.so @@ -397,6 +394,9 @@ rm -rf ${RPM_BUILD_ROOT} %doc Doc/* %changelog +* Tue Oct 11 2011 Dan Horák - 3.6.1-2 +- fix build without TBB + * Fri Sep 23 2011 Deji Akingunola - 3.6.1-1 - Update to 3.6.1 - Fix undefine symbols in libspqr From d1cf3c72ff4faf1f0e077bd681f5d33978e2083b Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Sat, 17 Nov 2012 07:22:28 -0500 Subject: [PATCH 3/3] Update to 4.0.2 --- sources | 2 +- suitesparse.spec | 92 ++++++++++++++++++++++++------------------------ 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/sources b/sources index 139c4ed..190b116 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -88a44890e8f61cdbb844a76b7259d876 SuiteSparse-3.6.1.tar.gz +efe53b7ef2b529d54727815231a5a6a9 SuiteSparse-4.0.2.tar.gz diff --git a/suitesparse.spec b/suitesparse.spec index eaf2279..6c99680 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -1,13 +1,12 @@ Name: suitesparse -Version: 3.6.1 -Release: 2%{?dist} +Version: 4.0.2 +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 -Patch0: suitesparse-fedora-build-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atlas-devel @@ -22,21 +21,21 @@ Provides: ufsparse = %{version}-%{release} %description suitesparse is a collection of libraries for computations involving sparse matrices. The package includes the following libraries: - AMD approximate minimum degree ordering - BTF permutation to block triangular form (beta) - CAMD constrained approximate minimum degree ordering - COLAMD column approximate minimum degree ordering - CCOLAMD constrained column approximate minimum degree ordering - CHOLMOD sparse Cholesky factorization - CSparse a concise sparse matrix package - CXSparse CSparse extended: complex matrix, int and long int support - KLU sparse LU factorization, primarily for circuit simulation - LDL a simple LDL' factorization - SQPR a multithread, multifrontal, rank-revealing sparse QR - factorization method - UMFPACK sparse LU factorization - UFconfig configuration file for all the above packages. - RBio read/write files in Rutherford/Boeing format + AMD approximate minimum degree ordering + BTF permutation to block triangular form (beta) + CAMD constrained approximate minimum degree ordering + COLAMD column approximate minimum degree ordering + CCOLAMD constrained column approximate minimum degree ordering + CHOLMOD sparse Cholesky factorization + CSparse a concise sparse matrix package + CXSparse CSparse extended: complex matrix, int and long int support + KLU sparse LU factorization, primarily for circuit simulation + LDL a simple LDL factorization + SQPR a multithread, multifrontal, rank-revealing sparse QR + factorization method + UMFPACK sparse LU factorization + SuiteSparse_config configuration file for all the above packages. + RBio read/write files in Rutherford/Boeing format %package devel @@ -75,37 +74,36 @@ This package contains documentation files for %{name}. %prep %setup -q -n SuiteSparse -%patch0 -p0 -b .build %build -%define amd_version 2.2.2 +%define amd_version 2.3.1 %define amd_version_major 2 -%define btf_version 1.1.2 +%define btf_version 1.2.0 %define btf_version_major 1 -%define camd_version 2.2.2 +%define camd_version 2.3.1 %define camd_version_major 2 -%define ccolamd_version 2.7.3 +%define ccolamd_version 2.8.0 %define ccolamd_version_major 2 -%define cholmod_version 1.7.3 -%define cholmod_version_major 1 -%define colamd_version 2.7.3 +%define cholmod_version 2.0.1 +%define cholmod_version_major 2 +%define colamd_version 2.8.0 %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.3 +%define csparse_version 3.1.1 +%define csparse_version_major 3 +%define cxsparse_version 3.1.1 +%define cxsparse_version_major 3 +%define klu_version 1.2.1 %define klu_version_major 1 -%define ldl_version 2.0.3 +%define ldl_version 2.1.0 %define ldl_version_major 2 -%define umfpack_version 5.5.1 +%define umfpack_version 5.6.1 %define umfpack_version_major 5 -%define spqr_version 1.2.1 +%define spqr_version 1.3.1 %define spqr_version_major 1 -%define rbio_version 2.0.1 +%define rbio_version 2.1.1 %define rbio_version_major 2 -%define ufconfig_version 3.6.0 -%define ufconfig_version_major 3 +%define SuiteSparse_config_ver 4.2.0 +%define SuiteSparse_config_major 4 ### 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. @@ -323,15 +321,15 @@ pushd SPQR cp -p README_SPQR.txt Doc/* ../Doc/SPQR popd -pushd UFconfig +pushd SuiteSparse_config make CFLAGS="$RPM_OPT_FLAGS -fPIC" - gcc $RPM_OPT_FLAGS -fPIC -c UFconfig.c + ar x libsuitesparseconfig.a pushd ../Lib - gcc -shared -Wl,-soname,libufconfig.so.%{ufconfig_version_major} -o \ - libufconfig.so.%{ufconfig_version} ../UFconfig/*.o - ln -sf libufconfig.so.%{ufconfig_version} libufconfig.so.%{ufconfig_version_major} - ln -sf libufconfig.so.%{ufconfig_version} libufconfig.so - cp -p ../UFconfig/*.a ./ + gcc -shared -Wl,-soname,libsuitesparseconfig.so.%{SuiteSparse_config_ver_major} -o \ + libsuitesparseconfig.so.%{SuiteSparse_config_ver} ../SuiteSparse_config/*.o + ln -sf libsuitesparseconfig.so.%{SuiteSparse_config_ver} libsuitesparseconfig.so.%{SuiteSparse_config_major} + ln -sf libsuitesparseconfig.so.%{SuiteSparse_config_ver} libsuitesparseconfig.so + cp -p ../SuiteSparse_config/*.a ./ popd cp -p *.h ../Include popd @@ -342,8 +340,7 @@ pushd RBio popd pushd ../Lib gcc -shared -Wl,-soname,librbio.so.%{rbio_version_major} -o \ - librbio.so.%{rbio_version} ../RBio/Lib/*.o \ - libufconfig.so.%{ufconfig_version_major} + 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 ./ @@ -394,6 +391,9 @@ rm -rf ${RPM_BUILD_ROOT} %doc Doc/* %changelog +* Fri Nov 16 2012 Deji Akingunola - 4.0.2-1 +- Update to 4.0.2 + * Tue Oct 11 2011 Dan Horák - 3.6.1-2 - fix build without TBB