diff --git a/SuiteSparse-5.2.0.tar.gz b/SuiteSparse-5.2.0.tar.gz deleted file mode 100644 index f2bd3ac..0000000 --- a/SuiteSparse-5.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c46c035ea8217649958a0f73360e825b0c9dcca4e32a9349d2c7678c0d48813 -size 46053054 diff --git a/SuiteSparse-5.4.0.tar.gz b/SuiteSparse-5.4.0.tar.gz new file mode 100644 index 0000000..2e66dc1 --- /dev/null +++ b/SuiteSparse-5.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:374dd136696c653e34ef3212dc8ab5b61d9a67a6791d5ec4841efb838e94dbd1 +size 52594099 diff --git a/suitesparse.changes b/suitesparse.changes index 546cc27..a990ed5 100644 --- a/suitesparse.changes +++ b/suitesparse.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Apr 6 12:04:27 UTC 2019 - Jan Engelhardt + +- Trim future visions from descriptions. + +------------------------------------------------------------------- +Tue Apr 2 09:24:03 UTC 2019 - Christoph G + +- Update to SuiteSparse 5.4.0 + * GraphBLAS 2.2.2: many upgrades and new features, a few bug fixes +- Update to SuiteSparse 5.3.0 + * new package: Mongoose (version 2.0.2) +- doc packages for AMD, CAMD, KLU, LDL, and Mongoose. + ------------------------------------------------------------------- Wed Mar 20 23:23:47 UTC 2019 - Stefan Brüns diff --git a/suitesparse.spec b/suitesparse.spec index b6a4aae..699a33c 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -24,9 +24,9 @@ Name: suitesparse Summary: A collection of sparse matrix libraries -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Version: 5.2.0 +Version: 5.4.0 Release: 0 Url: http://faculty.cse.tamu.edu/davis/SuiteSparse/ Source: http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-%{version}.tar.gz @@ -45,6 +45,7 @@ BuildRequires: chrpath BuildRequires: cmake BuildRequires: gcc-fortran BuildRequires: lapack-devel +BuildRequires: m4 BuildRequires: metis-devel BuildRequires: tbb-devel %if %{with openblas} @@ -54,19 +55,20 @@ BuildRequires: openblas-devel %define btfver 1.2.6 %define camdver 2.4.6 %define ccolamdver 2.9.6 -%define cholmodver 3.0.12 +%define cholmodver 3.0.13 %define colamdver 2.9.6 %define csparsever 3.2.0 %define cxsparsever 3.2.0 -%define graphblasver 2.0.1 +%define graphblasver 2.2.2 %define kluver 1.3.9 %define ldlver 2.2.6 +%define mongoosever 2.0.3 %define rbiover 2.2.6 -%define spqrver 2.0.8 -%define umfpackver 5.7.6 +%define spqrver 2.0.9 +%define umfpackver 5.7.8 # Your need define even it's just the same as main package # or the %%build loop will override %%version with umfpack's version. -%define configver 5.2.0 +%define configver 5.4.0 %define csparsemajor %(echo "%{csparsever}" | cut -d "." -f1) %define amdlib %(echo "libamd%{amdver}" | cut -d "." -f1) %define btflib %(echo "libbtf%{btfver}" | cut -d "." -f1) @@ -79,6 +81,7 @@ BuildRequires: openblas-devel %define graphblaslib %(echo "libgraphblas%{graphblasver}" | cut -d "." -f1) %define klulib %(echo "libklu%{kluver}" | cut -d "." -f1) %define ldllib %(echo "libldl%{ldlver}" | cut -d "." -f1) +%define mongooselib %(echo "libmongoose%{mongoosever}" | cut -d "." -f1) %define rbiolib %(echo "librbio%{rbiover}" | cut -d "." -f1) %define spqrlib %(echo "libspqr%{spqrver}" | cut -d "." -f1) %define umfpacklib %(echo "libumfpack%{umfpackver}" | cut -d "." -f1) @@ -90,7 +93,7 @@ matrices. %package devel Summary: Development headers for SuiteSparse -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Development/Libraries/C and C++ %if 0%{?suse_version} < 1500 Requires: gcc7-c++ @@ -110,6 +113,7 @@ Requires: %{cxsparselib} = %{cxsparsever} Requires: %{graphblaslib} = %{graphblasver} Requires: %{klulib} = %{kluver} Requires: %{ldllib} = %{ldlver} +Requires: %{mongooselib} = %{mongoosever} Requires: %{rbiolib} = %{rbiover} Requires: %{spqrlib} = %{spqrver} Requires: %{umfpacklib} = %{umfpackver} @@ -151,6 +155,8 @@ Provides: libklu-devel = %{kluver} Obsoletes: libklu-devel < %{kluver} Provides: libldl-devel = %{ldlver} Obsoletes: libldl-devel < %{ldlver} +Provides: libmongoose-devel = %{mongoosever} +Obsoletes: libmongoose-devel < %{mongoosever} Provides: librbio-devel = %{rbiover} Obsoletes: librbio-devel < %{rbiover} Provides: libspqr-devel = %{spqrver} @@ -171,7 +177,7 @@ applications which use the suitesparse libraries. %package devel-static Summary: Static version of SuiteSparse libraries -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} @@ -183,7 +189,7 @@ version of the suitesparse libraries. Version: %{amdver} Release: 0 Summary: Symmetric Approximate Minimum Degree -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Provides: %(echo "libamd-%{amdver}" | tr . _) = %{version} Obsoletes: %(echo "libamd-%{amdver}" | tr . _) < %{version} @@ -198,11 +204,19 @@ Note that this software has nothing to do with AMD the company. AMD is part of the SuiteSparse sparse matrix suite. +%package -n libamd-doc +Summary: Documentation for libamd +License: GPL-2.0-or-later AND LGPL-2.1-or-later +Group: Documentation/Other + +%description -n libamd-doc +Documentation for libamd. + %package -n %{btflib} Version: %{btfver} Release: 0 Summary: Permutation to Block Triangular Form -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Provides: %(echo "libbtf-%{btfver}" | tr . _) = %{version} Obsoletes: %(echo "libbtf-%{btfver}" | tr . _) < %{version} @@ -218,7 +232,7 @@ BTF is part of the SuiteSparse sparse matrix suite. Version: %{camdver} Release: 0 Summary: Symmetric Approximate Minimum Degree -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Provides: %(echo "libcamd-%{camdver}" | tr . _) = %{version} Obsoletes: %(echo "libcamd-%{camdver}" | tr . _) < %{version} @@ -231,11 +245,19 @@ interface is provided. CAMD is part of the SuiteSparse sparse matrix suite. +%package -n libcamd-doc +Summary: Documentation for libcamd +License: GPL-2.0-or-later AND LGPL-2.1-or-later +Group: Documentation/Other + +%description -n libcamd-doc +Documentation for libcam. + %package -n %{ccolamdlib} Version: %{ccolamdver} Release: 0 Summary: Constrained Column Approximate Minimum Degree -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Provides: %(echo "libccolamd-%{ccolamdver}" | tr . _) = %{version} Obsoletes: %(echo "libccolamd-%{ccolamdver}" | tr . _) < %{version} @@ -251,7 +273,7 @@ CCOLAMD is part of the SuiteSparse sparse matrix suite. Version: %{cholmodver} Release: 0 Summary: Supernodal Sparse Cholesky Factorization and Update/Downdate -License: GPL-2.0 and LGPL-2.1 +License: GPL-2.0-only AND LGPL-2.1-only Group: System/Libraries Provides: %(echo "libcholmod-%{cholmodver}" | tr . _) = %{version} Obsoletes: %(echo "libcholmod-%{cholmodver}" | tr . _) < %{version} @@ -280,7 +302,7 @@ CHOLMOD is part of the SuiteSparse sparse matrix suite. Version: %{colamdver} Release: 0 Summary: Column Approximate Minimum Degree -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Provides: %(echo "libcolamd-%{colamdver}" | tr . _) = %{version} Obsoletes: %(echo "libcolamd-%{colamdver}" | tr . _) < %{version} @@ -303,7 +325,7 @@ COLAMD is part of the SuiteSparse sparse matrix suite. Version: %{csparsever} Release: 0 Summary: Instructional Sparse Matrix Package -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Provides: %(echo "libcsparse-%{csparsever}" | tr . _) = %{version} Obsoletes: %(echo "libcsparse-%{csparsever}" | tr . _) < %{version} @@ -335,7 +357,7 @@ CSparse is part of the SuiteSparse sparse matrix suite. Version: %{cxsparsever} Release: 0 Summary: An extended version of CSparse -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Provides: %(echo "libcxsparse-%{cxsparsever}" | tr . _) = %{version} Obsoletes: %(echo "libcxsparse-%{cxsparsever}" | tr . _) < %{version} @@ -370,7 +392,7 @@ GraphBLAS is part of the SuiteSparse sparse matrix suite. Version: %{kluver} Release: 0 Summary: Sparse LU Factorization, for Circuit Simulation -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Provides: %(echo "libklu-%{kluver}" | tr . _) = %{version} Obsoletes: %(echo "libklu-%{kluver}" | tr . _) < %{version} @@ -383,11 +405,19 @@ the "fast sparse-matrix solver" mentioned in the article. KLU is part of the SuiteSparse sparse matrix suite. +%package -n libklu-doc +Summary: Documentation for libklu +License: GPL-2.0-or-later AND LGPL-2.1-or-later +Group: Documentation/Other + +%description -n libklu-doc +Documentation for libklu. + %package -n %{ldllib} Version: %{ldlver} Release: 0 Summary: A Simple LDL^T Factorization -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Provides: %(echo "libldl-%{ldlver}" | tr . _) = %{version} Obsoletes: %(echo "libldl-%{ldlver}" | tr . _) < %{version} @@ -405,11 +435,42 @@ in C, and includes a MATLAB interface. LDL is part of the SuiteSparse sparse matrix suite. +%package -n libldl-doc +Summary: Documentation for libldl +License: GPL-2.0-or-later AND LGPL-2.1-or-later +Group: Documentation/Other + +%description -n libldl-doc +Documentation for libldl. + +%package -n %{mongooselib} +Version: %{mongoosever} +Release: 0 +Summary: Graph partitioning library +License: GPL-3.0-only +Group: System/Libraries +Provides: %(echo "libldl-%{mongoosever}" | tr . _) = %{version} +Obsoletes: %(echo "libldl-%{mongoosever}" | tr . _) < %{version} + +%description -n %{mongooselib} +Mongoose is a graph partitioning library. Currently, Mongoose only +supports edge partitioning. + +mongoose is part of the SuiteSparse sparse matrix suite. + +%package -n libmongoose-doc +Summary: Documentation for libmongoose +License: GPL-2.0-or-later AND LGPL-2.1-or-later +Group: Documentation/Other + +%description -n libmongoose-doc +Documentation for libmongoose. + %package -n %{rbiolib} Version: %{rbiover} Release: 0 Summary: MATLAB Toolbox for Reading/Writing Sparse Matrices -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Libraries Provides: %(echo "librbio-%{rbiover}" | tr . _) = %{version} Obsoletes: %(echo "librbio-%{rbiover}" | tr . _) < %{version} @@ -426,7 +487,7 @@ RBio is part of the SuiteSparse sparse matrix suite. Version: %{spqrver} Release: 0 Summary: Multifrontal Sparse QR -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Libraries Provides: %(echo "libspqr-%{spqrver}" | tr . _) = %{version} Obsoletes: %(echo "libspqr-%{spqrver}" | tr . _) < %{version} @@ -446,7 +507,7 @@ SuiteSparseQR is part of the SuiteSparse sparse matrix suite. Version: %{umfpackver} Release: 0 Summary: Sparse Multifrontal LU Factorization -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Libraries Provides: %(echo "libumfpack-%{umfpackver}" | tr . _) = %{version} Obsoletes: %(echo "libumfpack-%{umfpackver}" | tr . _) < %{version} @@ -466,7 +527,7 @@ UMFPACK is part of the SuiteSparse sparse matrix suite. Version: %{configver} Release: 0 Summary: Common configurations for all packages in SuiteSparse -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Libraries Provides: libufconfig = %{configver} Obsoletes: libufconfig < %{configver} @@ -479,7 +540,8 @@ Obsoletes: %(echo "libsuitesparseconfig%{configver}" | tr . _) < %{version} SuiteSparse_config is required by a number of sparse matrix packages, including SuiteSparseQR, AMD, COLAMD, CCOLAMD, CHOLMOD, KLU, BTF, LDL, CXSparse, RBio, and UMFPACK. It is not required by CSparse, -which is a stand-alone package. +which is a stand-alone packages. Mongoose uses SuiteSparse_config, +if available but works also without it. SuiteSparse_config contains a configuration file for "make" (SuiteSparse_config.mk) and an include file (SuiteSparse_config.h). @@ -532,6 +594,8 @@ make MY_METIS_LIB="-lmetis" LAPACK="-llapack" BLAS="$blas_lib" TBB="-ltbb" CFLAG chrpath -d lib/*.so.*.* chrpath -d GraphBLAS/build/*.so chrpath -d GraphBLAS/build/*.so.*.* +chrpath -d Mongoose/build/lib/*.so +chrpath -d Mongoose/build/lib/*.so.*.* %install mkdir -p %{buildroot}%{_includedir}/%{name} @@ -542,6 +606,8 @@ cp -Pt %{buildroot}%{_libdir} */Lib/*.a cp -Pt %{buildroot}%{_libdir} lib/* cp -Pt %{buildroot}%{_libdir} GraphBLAS/build/*.so cp -Pt %{buildroot}%{_libdir} GraphBLAS/build/*.so.* +cp -Pt %{buildroot}%{_libdir} Mongoose/build/lib/*.so +cp -Pt %{buildroot}%{_libdir} Mongoose/build/lib/*.so.* cp -Pt %{buildroot}%{_includedir}/%{name} include/* cp -Pt %{buildroot}%{_includedir}/%{name} GraphBLAS/Include/*.h cp -Prt %{buildroot}%{_docdir} share/doc/* @@ -620,6 +686,9 @@ popd %post -n %{ldllib} -p /sbin/ldconfig %postun -n %{ldllib} -p /sbin/ldconfig +%post -n %{mongooselib} -p /sbin/ldconfig +%postun -n %{mongooselib} -p /sbin/ldconfig + %post -n %{rbiolib} -p /sbin/ldconfig %postun -n %{rbiolib} -p /sbin/ldconfig @@ -644,13 +713,15 @@ popd %license LICENSE.txt %{_libdir}/*.a - %files -n %{amdlib} %doc AMD/README.txt -%doc AMD/Doc/AMD_UserGuide.pdf AMD/Doc/ChangeLog +%doc AMD/Doc/ChangeLog %license AMD/Doc/License.txt AMD/Doc/lesser.txt %{_libdir}/libamd.so.* +%files -n libamd-doc +%doc AMD/Doc/AMD_UserGuide.pdf + %files -n %{btflib} %doc BTF/README.txt %doc BTF/Doc/ChangeLog @@ -659,10 +730,13 @@ popd %files -n %{camdlib} %doc CAMD/README.txt -%doc CAMD/Doc/CAMD_UserGuide.pdf CAMD/Doc/ChangeLog +%doc CAMD/Doc/ChangeLog %license CAMD/Doc/License.txt CAMD/Doc/lesser.txt %{_libdir}/libcamd.so.* +%files -n libcamd-doc +%doc CAMD/Doc/CAMD_UserGuide.pdf + %files -n %{ccolamdlib} %doc CCOLAMD/README.txt %doc CCOLAMD/Doc/ChangeLog @@ -703,16 +777,30 @@ popd %files -n %{klulib} %doc KLU/README.txt -%doc KLU/Doc/KLU_UserGuide.pdf KLU/Doc/ChangeLog +%doc KLU/Doc/ChangeLog %license KLU/Doc/License.txt KLU/Doc/lesser.txt %{_libdir}/libklu.so.* +%files -n libldl-doc +%doc KLU/Doc/KLU_UserGuide.pdf + %files -n %{ldllib} %doc LDL/README.txt -%doc LDL/Doc/ldl_userguide.pdf LDL/Doc/ChangeLog +%doc LDL/Doc/ChangeLog %license LDL/Doc/License.txt LDL/Doc/lesser.txt %{_libdir}/libldl.so.* +%files -n libldl-doc +%doc LDL/Doc/ldl_userguide.pdf + +%files -n %{mongooselib} +%doc Mongoose/README.md +%license Mongoose/Doc/License.txt +%{_libdir}/libmongoose.so.* + +%files -n libmongoose-doc +%doc Mongoose/Doc/Mongoose_UserGuide.pdf + %files -n %{rbiolib} %doc RBio/README.txt %doc RBio/Doc/ChangeLog