diff --git a/.gitignore b/.gitignore index 011975d..2b3db94 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /*.src.rpm /x86_64/ /noarch/ +/v5.10.1.tar.gz diff --git a/sources b/sources index 455f4e1..98fa5a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SuiteSparse-5.4.0.tar.gz) = 8328bcc2ef5eb03febf91b9c71159f091ff405c1ba7522e53714120fcf857ceab2d2ecf8bf9a2e1fc45e1a934665a341e3a47f954f87b59934f4fce6164775d6 +SHA512 (v5.10.1.tar.gz) = 8f85c6d63b76cba95707dfa732c51200df7794cb4c2599dbd92100475747b8d02b05089a47096e85c60b89bc852a8e768e0670f24902a82d29494a80ccf2bb5f diff --git a/suitesparse.spec b/suitesparse.spec index adcb0ec..63535fb 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -31,13 +31,13 @@ %endif Name: suitesparse -Version: 5.4.0 -Release: 7%{?dist} +Version: 5.10.1 +Release: 1%{?dist} Summary: A collection of sparse matrix libraries License: (LGPLv2+ or BSD) and LGPLv2+ and GPLv2+ URL: http://faculty.cse.tamu.edu/davis/suitesparse.html -Source0: http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-%{version}.tar.gz +Source0: https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v%{version}.tar.gz BuildRequires: make BuildRequires: gcc @@ -164,7 +164,7 @@ This package contains documentation files for %{name}. %prep %setup -c -q -pushd SuiteSparse +pushd SuiteSparse-%{version} # Remove bundled metis rm -r metis* # Makefiles look for metis.h specifically @@ -187,8 +187,8 @@ pushd SuiteSparse $(find -name Makefile\* -o -name \*.mk) popd %if 0%{?build64} -cp -a SuiteSparse SuiteSparse64 -cp -a SuiteSparse SuiteSparse64_ +cp -a SuiteSparse-%{version} SuiteSparse64-%{version} +cp -a SuiteSparse-%{version} SuiteSparse64_-%{version} %endif %build @@ -197,7 +197,7 @@ export CC=gcc for build in SuiteSparse %{?build64:SuiteSparse64 SuiteSparse64_} do - pushd $build + pushd $build-%{version} # TODO - Try to use upstream makefile - will build more components mkdir -p Doc/{AMD,BTF,CAMD,CCOLAMD,CHOLMOD,COLAMD,KLU,LDL,UMFPACK,SPQR,RBio} Include @@ -346,18 +346,19 @@ done %install mkdir -p ${RPM_BUILD_ROOT}%{_libdir} mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/%{name} -cp -a SuiteSparse/Include/*.{h,hpp} ${RPM_BUILD_ROOT}%{_includedir}/%{name}/ +cp -a SuiteSparse-%{version}/Include/*.{h,hpp} ${RPM_BUILD_ROOT}%{_includedir}/%{name}/ for build in SuiteSparse %{?build64:SuiteSparse64 SuiteSparse64_} do - pushd $build + pushd $build-%{version} cp -a */Lib/*.a lib/*.so* ${RPM_BUILD_ROOT}%{_libdir}/ chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/*.so.* # collect licenses in one place to ship as base package documentation rm -rf Licenses mkdir Licenses - find */ -iname lesser.txt -o -iname license.txt -o -iname gpl.txt -o \ - -iname license | while read f; do + find */ -iname lesser.txt -o -iname lesserv3.txt -o -iname license.txt -o \ + -iname gpl.txt -o -iname GPLv2.txt -o -iname license \ + -a -not -type d | while read f; do b="${f%%/*}" r="${f#$b}" x="$(echo "$r" | sed 's|/doc/|/|gi')" @@ -381,7 +382,7 @@ TESTDIRS="$TESTDIRS CXSparse" %endif for build in SuiteSparse %{?build64:SuiteSparse64 SuiteSparse64_} do - pushd $build + pushd $build-%{version} export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/metis" export LAPACK="" # Set flags for ILP64 build @@ -406,7 +407,7 @@ do done %files -%license SuiteSparse/Licenses +%license SuiteSparse-%{version}/Licenses %{_libdir}/libamd.so.%{amd_version_major}* %{_libdir}/libbtf.so.%{btf_version_major}* %{_libdir}/libcamd.so.%{camd_version_major}* @@ -435,7 +436,7 @@ done %if 0%{?build64} %files -n %{name}64 -%license SuiteSparse64/Licenses +%license SuiteSparse64-%{version}/Licenses %{_libdir}/libamd64.so.%{amd_version_major}* %{_libdir}/libbtf64.so.%{btf_version_major}* %{_libdir}/libcamd64.so.%{camd_version_major}* @@ -460,7 +461,7 @@ done %{_libdir}/lib*64.a %files -n %{name}64_ -%license SuiteSparse64_/Licenses +%license SuiteSparse64_-%{version}/Licenses %{_libdir}/libamd64_.so.%{amd_version_major}* %{_libdir}/libbtf64_.so.%{btf_version_major}* %{_libdir}/libcamd64_.so.%{camd_version_major}* @@ -486,9 +487,12 @@ done %endif %files doc -%doc SuiteSparse/Doc/* +%doc SuiteSparse-%{version}/Doc/* %changelog +* Sun Jul 25 2021 Milan Bouchet-Valat - 5.10.1 +- New upstream release. + * Fri Jul 23 2021 Fedora Release Engineering - 5.4.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild