diff --git a/SuiteSparse-5.10.0.tar.gz b/SuiteSparse-5.10.0.tar.gz deleted file mode 100644 index d675767..0000000 --- a/SuiteSparse-5.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4bcc974901c0173acf80c41ee0fd779eb7dce2871d4afa24a5d15b1a468f93e5 -size 59919998 diff --git a/SuiteSparse-5.10.1.tar.gz b/SuiteSparse-5.10.1.tar.gz new file mode 100644 index 0000000..3f4e5ce --- /dev/null +++ b/SuiteSparse-5.10.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee +size 59919745 diff --git a/disable-Wmisleading-indentation.patch b/disable-Wmisleading-indentation.patch deleted file mode 100644 index 6d375ad..0000000 --- a/disable-Wmisleading-indentation.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/GraphBLAS/Demo/Include/graphblas_demos.h b/GraphBLAS/Demo/Include/graphblas_demos.h -index 62809df..333c0b3 100644 ---- a/GraphBLAS/Demo/Include/graphblas_demos.h -+++ b/GraphBLAS/Demo/Include/graphblas_demos.h -@@ -25,8 +25,6 @@ - #pragma GCC diagnostic ignored "-Wint-in-bool-context" - #pragma GCC diagnostic ignored "-Wformat-truncation=" - #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" --// enable these warnings as errors --#pragma GCC diagnostic error "-Wmisleading-indentation" - #endif - - #pragma GCC diagnostic ignored "-Wunknown-pragmas" -diff --git a/GraphBLAS/Source/GB_warnings.h b/GraphBLAS/Source/GB_warnings.h -index 9591b84..cefc366 100644 ---- a/GraphBLAS/Source/GB_warnings.h -+++ b/GraphBLAS/Source/GB_warnings.h -@@ -56,8 +56,6 @@ - #pragma GCC diagnostic ignored "-Wint-in-bool-context" - #pragma GCC diagnostic ignored "-Wformat-truncation=" - #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" --// enable these warnings as errors --#pragma GCC diagnostic error "-Wmisleading-indentation" - #endif - - // disable warnings from -Wall -Wextra -Wpendantic diff --git a/suitesparse.changes b/suitesparse.changes index f5da7b4..59bb448 100644 --- a/suitesparse.changes +++ b/suitesparse.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 26 18:23:49 UTC 2021 - Christoph G + +- Update to version 5.10.1 +- Drop disable-Wmisleading-indentation.patch which is no longer + required due to an upstream fix + ------------------------------------------------------------------- Wed May 19 21:29:18 UTC 2021 - Christoph G diff --git a/suitesparse.spec b/suitesparse.spec index 9c972e6..0851f04 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -30,15 +30,13 @@ Name: suitesparse Summary: A collection of sparse matrix libraries License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Version: 5.10.0 +Version: 5.10.1 Release: 0 URL: https://people.engr.tamu.edu/davis/suitesparse.html Source0: https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v%{version}.tar.gz#/SuiteSparse-%{version}.tar.gz Source2: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE build_csparse_shared.patch -- Build CSparse as a shared library Patch1: build_csparse_shared.patch -# PATCH-FIX-OPENSUSE disable-Wmisleading-indentation.patch bsc#1183575 -Patch2: disable-Wmisleading-indentation.patch Patch775418: bnc775418-enable-SuiteSparse_time-symbol.patch %if 0%{?suse_version} < 1500 BuildRequires: gcc7 @@ -68,7 +66,7 @@ BuildRequires: openblas-devel %define colamdver 2.9.6 %define csparsever 3.2.0 %define cxsparsever 3.2.0 -%define graphblasver 5.0.4 +%define graphblasver 5.0.5 %define kluver 1.3.9 %define ldlver 2.2.6 %define mongoosever 2.0.3 @@ -78,7 +76,7 @@ BuildRequires: openblas-devel %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.10.0 +%define configver 5.10.1 %define csparsemajor %(echo "%{csparsever}" | cut -d "." -f1) %define amdlib %(echo "libamd%{amdver}" | cut -d "." -f1) %define btflib %(echo "libbtf%{btfver}" | cut -d "." -f1) @@ -590,7 +588,6 @@ SuiteSparse_config is part of the SuiteSparse sparse matrix suite. %prep %setup -q -n SuiteSparse-%{version} %patch1 -p1 -%patch2 -p1 sed 's/^CHOLMOD_CONFIG =.*/CHOLMOD_CONFIG = -DNPARTITION/' -i SuiteSparse_config/SuiteSparse_config.mk %if %{without openblas} sed 's/-lopenblas/-lblas/' -i SuiteSparse_config/SuiteSparse_config.mk