Fix ctest commands

.gitignore

@@ -21,3 +21,4 @@ sundials-2.3.0.tar.gz
 /sundials-5.6.1.tar.gz
 /sundials-5.7.0.tar.gz
 /sundials-5.8.0.tar.gz
+/sundials-6.5.1.tar.gz

sources

@@ -1 +1 @@
-SHA512 (sundials-5.8.0.tar.gz) = 30f6a7bddf813634e4266c36331673b52448b719f938f45a4efb6a96cfbeea4fe168fdded89309672b148f8ef8bc05997d838627e828573900ec169a41472372
+SHA512 (sundials-6.5.1.tar.gz) = c68fa7bd5e228739f08f2c328b3e45866ce43e5d9156e98254cf81c6fe7bfc89882a9fff6445e35df5c09cb56364711138de9258fcf4b53dfe70251bf7003196

sundials-klu64.patch

@@ -0,0 +1,39 @@
+--- a/cmake/tpl/FindKLU.orig.cmake	2021-09-30 21:05:25.000000000 +0200
++++ b/cmake/tpl/FindKLU.cmake	2023-03-03 21:28:45.354177379 +0100
+@@ -54,31 +54,31 @@
+ 
+ else ()
+     # find library with user provided directory path
+-    set(KLU_LIBRARY_NAME klu)
++    set(KLU_LIBRARY_NAME klu64)
+     find_library(KLU_LIBRARY ${KLU_LIBRARY_NAME} ${KLU_LIBRARY_DIR} NO_DEFAULT_PATH)
+ endif ()
+ mark_as_advanced(KLU_LIBRARY)
+ 
+ if (NOT AMD_LIBRARY)
+-    set(AMD_LIBRARY_NAME amd)
++    set(AMD_LIBRARY_NAME amd64)
+     find_library(AMD_LIBRARY ${AMD_LIBRARY_NAME} ${KLU_LIBRARY_DIR} NO_DEFAULT_PATH)
+     mark_as_advanced(AMD_LIBRARY)
+ endif ()
+ 
+ if (NOT COLAMD_LIBRARY)
+-    set(COLAMD_LIBRARY_NAME colamd)
++    set(COLAMD_LIBRARY_NAME colamd64)
+     find_library(COLAMD_LIBRARY ${COLAMD_LIBRARY_NAME} ${KLU_LIBRARY_DIR} NO_DEFAULT_PATH)
+     mark_as_advanced(COLAMD_LIBRARY)
+ endif ()
+ 
+ if (NOT BTF_LIBRARY)
+-    set(BTF_LIBRARY_NAME btf)
++    set(BTF_LIBRARY_NAME btf64)
+     find_library( BTF_LIBRARY ${BTF_LIBRARY_NAME} ${KLU_LIBRARY_DIR} NO_DEFAULT_PATH)
+     mark_as_advanced(BTF_LIBRARY)
+ endif ()
+ 
+ if (NOT SUITESPARSECONFIG_LIBRARY)
+-    set(SUITESPARSECONFIG_LIBRARY_NAME suitesparseconfig)
++    set(SUITESPARSECONFIG_LIBRARY_NAME suitesparseconfig64)
+     # NOTE: no prefix for this library on windows
+     if(WIN32 AND NOT MSYS)
+         set(CMAKE_FIND_LIBRARY_PREFIXES "")

sundials.spec

@@ -35,17 +35,17 @@
 ###########
 
 ## SuperLUMT ##
-%global with_superlumt 0
+%global with_superlumt 1
 ###########
 
-## superlu_dist is not compiled with index_size64 enabled ##
+## superlu_dist ##
 %global with_superludist 0
 ###########
 
 %if 0%{?rhel} && 0%{?rhel} >= 9
 # KLU support
 %global with_klu   1
-%global with_klu64 0
+%global with_klu64 1
 ##########
 # Fortran
 %if 0%{?with_klu64}
@@ -74,8 +74,8 @@
 
 Summary:    Suite of nonlinear solvers
 Name:       sundials
-Version:    5.8.0
-Release:    11%{?dist}
+Version:    6.5.1
+Release:    2%{?dist}
 # SUNDIALS is licensed under BSD with some additional (but unrestrictive) clauses.
 # Check the file 'LICENSE' for details.
 License:    BSD
@@ -89,12 +89,13 @@ Patch0:     %{name}-5.5.0-set_superlumt_name.patch
 Patch1:     %{name}-5.5.0-set_superlumt64_name.patch
 
 Patch2:     %{name}-change_petsc_variable.patch
+Patch3:     %{name}-klu64.patch
 
 BuildRequires: make
 %if 0%{?with_fortran}
 BuildRequires: gcc-gfortran
 %endif
-BuildRequires: python%{python3_pkgversion}-devel
+BuildRequires: python3-devel
 BuildRequires: gcc, gcc-c++
 %if 0%{?epel}
 BuildRequires: epel-rpm-macros
@@ -119,9 +120,6 @@ BuildRequires: suitesparse-devel
 %endif
 ##########
 
-%if 0%{?rhel} && 0%{?rhel} == 8
-BuildRequires: rsh
-%endif
 %if 0%{?with_fortran}
 Requires: gcc-gfortran%{?_isa}
 %endif
@@ -233,10 +231,14 @@ This package contains the documentation files.
 pushd %{name}-%{version}
 
 %ifarch s390x x86_64 %{power64} aarch64
-%patch1 -p0 -b .set_superlumt64_name
+%patch 1 -p0 -b .set_superlumt64_name
 %endif
 %ifarch %{arm} %{ix86}
-%patch0 -p0 -b .set_superlumt_name
+%patch 0 -p0 -b .set_superlumt_name
+%endif
+
+%if 0%{?with_klu64}
+%patch 3 -p1 -b .klu64
 %endif
 
 mv src/arkode/README.md src/README-arkode.md
@@ -269,6 +271,7 @@ export LIBSUPERLUMTLINK=-lsuperlumt_d
 %endif
 %endif
 
+
 %if %{with debug}
 %undefine _hardened_build
 export CFLAGS=" "
@@ -397,24 +400,27 @@ export CFLAGS="%{build_cflags}"
 export CFLAGS="%{build_fflags}"
 %cmake3 -B buildopenmpi_dir/build -S buildopenmpi_dir \
 %endif
-%if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 64
- -DSUNDIALS_INDEX_SIZE:STRING=64 \
 %if 0%{?with_klu64}
+ -DSUNDIALS_INDEX_SIZE:STRING=64 \
  -DKLU_ENABLE=ON -DKLU_LIBRARY_DIR:PATH=%{_libdir} -DKLU_LIBRARY=%{_libdir}/libklu64.so \
  -DAMD_LIBRARY=%{_libdir}/libamd64.so -DAMD_LIBRARY_DIR:PATH=%{_libdir} \
  -DBTF_LIBRARY=%{_libdir}/libbtf64.so -DBTF_LIBRARY_DIR:PATH=%{_libdir} \
  -DCOLAMD_LIBRARY=%{_libdir}/libcolamd64.so -DCOLAMD_LIBRARY_DIR:PATH=%{_libdir} \
  -DKLU_INCLUDE_DIR:PATH=%{_includedir}/suitesparse \
+ -DPETSC_ENABLE:BOOL=OFF \
 %endif
-%endif
-%if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 32
- -DSUNDIALS_INDEX_SIZE:STRING=32 \
 %if 0%{?with_klu}
+ -DSUNDIALS_INDEX_SIZE:STRING=32 \
  -DKLU_ENABLE=ON -DKLU_LIBRARY_DIR:PATH=%{_libdir} -DKLU_LIBRARY=%{_libdir}/libklu.so \
  -DAMD_LIBRARY=%{_libdir}/libamd.so -DAMD_LIBRARY_DIR:PATH=%{_libdir} \
  -DBTF_LIBRARY=%{_libdir}/libbtf.so -DBTF_LIBRARY_DIR:PATH=%{_libdir} \
  -DCOLAMD_LIBRARY=%{_libdir}/libcolamd.so -DCOLAMD_LIBRARY_DIR:PATH=%{_libdir} \
  -DKLU_INCLUDE_DIR:PATH=%{_includedir}/suitesparse \
+%if 0%{?with_petsc}
+ -DPETSC_ENABLE:BOOL=ON \
+ -DPETSC_INCLUDES:PATH=$MPI_INCLUDE/petsc \
+ -DPETSC_LIBRARIES:PATH=$MPI_LIB/libpetsc.so \
+ -DPETSC_EXECUTABLE_RUNS:BOOL=ON \
 %endif
 %endif
  -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
@@ -425,12 +431,6 @@ export CFLAGS="%{build_fflags}"
  -DMPI_INCLUDE_PATH:PATH=$MPI_INCLUDE \
  -DCMAKE_INSTALL_INCLUDEDIR:PATH=$MPI_INCLUDE \
  -DLAPACK_ENABLE:BOOL=OFF \
-%if 0%{?with_petsc}
- -DPETSC_ENABLE:BOOL=ON \
- -DPETSC_INCLUDES:PATH=$MPI_INCLUDE/petsc \
- -DPETSC_LIBRARIES:PATH=$MPI_LIB/libpetsc.so \
- -DPETSC_EXECUTABLE_RUNS=YES \
-%endif
  -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib}/openmpi/lib \
  -DPYTHON_EXECUTABLE:FILEPATH=%{__python3} \
  -DEXAMPLES_ENABLE_CXX:BOOL=ON -DEXAMPLES_ENABLE_C:BOOL=ON \
@@ -534,24 +534,27 @@ export CFLAGS="%{build_cflags}"
 export CFLAGS="%{build_fflags}"
 %cmake3 -B buildmpich_dir/build -S buildmpich_dir \
 %endif
-%if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 64
- -DSUNDIALS_INDEX_SIZE:STRING=64 \
 %if 0%{?with_klu64}
+ -DSUNDIALS_INDEX_SIZE:STRING=64 \
  -DKLU_ENABLE=ON -DKLU_LIBRARY_DIR:PATH=%{_libdir} -DKLU_LIBRARY=%{_libdir}/libklu64.so \
  -DAMD_LIBRARY=%{_libdir}/libamd64.so -DAMD_LIBRARY_DIR:PATH=%{_libdir} \
  -DBTF_LIBRARY=%{_libdir}/libbtf64.so -DBTF_LIBRARY_DIR:PATH=%{_libdir} \
  -DCOLAMD_LIBRARY=%{_libdir}/libcolamd64.so -DCOLAMD_LIBRARY_DIR:PATH=%{_libdir} \
  -DKLU_INCLUDE_DIR:PATH=%{_includedir}/suitesparse \
+ -DPETSC_ENABLE:BOOL=OFF \
 %endif
-%endif
-%if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 32
- -DSUNDIALS_INDEX_SIZE:STRING=32 \
 %if 0%{?with_klu}
+ -DSUNDIALS_INDEX_SIZE:STRING=32 \
  -DKLU_ENABLE=ON -DKLU_LIBRARY_DIR:PATH=%{_libdir} -DKLU_LIBRARY=%{_libdir}/libklu.so \
  -DAMD_LIBRARY=%{_libdir}/libamd.so -DAMD_LIBRARY_DIR:PATH=%{_libdir} \
  -DBTF_LIBRARY=%{_libdir}/libbtf.so -DBTF_LIBRARY_DIR:PATH=%{_libdir} \
  -DCOLAMD_LIBRARY=%{_libdir}/libcolamd.so -DCOLAMD_LIBRARY_DIR:PATH=%{_libdir} \
  -DKLU_INCLUDE_DIR:PATH=%{_includedir}/suitesparse \
+%if 0%{?with_petsc}
+ -DPETSC_ENABLE:BOOL=ON \
+ -DPETSC_INCLUDES:PATH=$MPI_INCLUDE/petsc \
+ -DPETSC_LIBRARIES:PATH=$MPI_LIB/libpetsc.so \
+ -DPETSC_EXECUTABLE_RUNS:BOOL=ON \
 %endif
 %endif
  -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
@@ -562,12 +565,6 @@ export CFLAGS="%{build_fflags}"
  -DLAPACK_ENABLE:BOOL=OFF \
  -DMPI_INCLUDE_PATH:PATH=$MPI_INCLUDE \
  -DCMAKE_INSTALL_INCLUDEDIR:PATH=$MPI_INCLUDE \
-%if 0%{?with_petsc}
- -DPETSC_ENABLE:BOOL=ON \
- -DPETSC_INCLUDES:PATH=$MPI_INCLUDE/petsc \
- -DPETSC_LIBRARIES:PATH=$MPI_LIB/libpetsc.so \
- -DPETSC_EXECUTABLE_RUNS=YES \
-%endif
  -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib}/mpich/lib \
  -DPYTHON_EXECUTABLE:FILEPATH=%{__python3} \
  -DEXAMPLES_ENABLE_CXX:BOOL=ON -DEXAMPLES_ENABLE_C:BOOL=ON \
@@ -646,19 +643,19 @@ rm -f %{buildroot}%{_includedir}/sundials/NOTICE
 %check
 %if 0%{?with_openmpi}
 %if 0%{?with_openmpicheck}
-%define _vpath_builddir buildopenmpi_dir/build
 %{_openmpi_load}
+%define _vpath_builddir buildopenmpi_dir/build
 %if %{with debug}
 export LD_LIBRARY_PATH=%{buildroot}$MPI_LIB:$MPI_LIB
 export OMPI_MCA_rmaps_base_oversubscribe=yes
-ctest3 --force-new-ctest-process -VV -j1 --output-on-failure --debug
+%ctest -- -VV --output-on-failure --debug
 %else
 export LD_LIBRARY_PATH=%{buildroot}$MPI_LIB:$MPI_LIB
 export OMPI_MCA_rmaps_base_oversubscribe=yes
 %ifarch aarch64 %{power64}
-/usr/bin/ctest --output-on-failure --force-new-ctest-process -j1 -E 'test_fsunlinsol_dense_mod|test_sunnonlinsol_petscsnes'
+%ctest -- --output-on-failure -E 'test_sunlinsol_superlumt'
 %else
-/usr/bin/ctest --output-on-failure --force-new-ctest-process -j1 -E 'test_sunnonlinsol_petscsnes|test_sunlinsol_klu'
+%ctest -- --output-on-failure -E 'test_sunlinsol_superlumt|test_fsunlinsol_dense_mod'
 %endif
 %endif
 %{_openmpi_unload}
@@ -669,17 +666,17 @@ export OMPI_MCA_rmaps_base_oversubscribe=yes
 
 %if 0%{?with_mpich}
 %if 0%{?with_mpichcheck}
-%define _vpath_builddir buildmpich_dir/build
 %{_mpich_load}
+%define _vpath_builddir buildmpich_dir/build
 %if %{with debug}
 export LD_LIBRARY_PATH=%{buildroot}$MPI_LIB:$MPI_LIB
-ctest3 --force-new-ctest-process -VV -j1 --output-on-failure --debug
+%ctest -- -VV --output-on-failure --debug
 %else
 export LD_LIBRARY_PATH=%{buildroot}$MPI_LIB:$MPI_LIB
 %ifarch aarch64 %{power64}
-/usr/bin/ctest --output-on-failure --force-new-ctest-process -j1 -E 'test_fsunlinsol_dense_mod|test_sunnonlinsol_petscsnes'
+%ctest -- --output-on-failure -E 'test_sunlinsol_superlumt'
 %else
-/usr/bin/ctest --output-on-failure --force-new-ctest-process -j1 -E 'test_sunnonlinsol_petscsnes|test_sunlinsol_klu'
+%ctest -- --output-on-failure -E 'test_sunlinsol_superlumt|test_fsunlinsol_dense_mod'
 %endif
 %endif
 %{_mpich_unload}
@@ -692,13 +689,13 @@ export LD_LIBRARY_PATH=%{buildroot}$MPI_LIB:$MPI_LIB
 %define _vpath_builddir sundials-%{version}/build
 %if %{with debug}
 export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
-ctest3 --force-new-ctest-process -VV -j1 --output-on-failure --debug
+%ctest -- -VV --output-on-failure --debug
 %else
 export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %ifarch aarch64 %{power64}
-/usr/bin/ctest --output-on-failure --force-new-ctest-process -j1 -E 'test_fsunlinsol_dense_mod'
+%ctest -- --output-on-failure -E 'test_sunlinsol_superlumt'
 %else
-/usr/bin/ctest --output-on-failure --force-new-ctest-process -j1 -E 'test_sunlinsol_klu'
+%ctest -- --output-on-failure -E 'test_sunlinsol_superlumt|test_fsunlinsol_dense_mod'
 %endif
 %endif
 %endif
@@ -730,7 +727,6 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %{_libdir}/libsundials_sunnonlinsol*.so.*
 %if 0%{?with_fortran}
 %{_libdir}/libsundials_f*[_mod].so.*
-%{_libdir}/libsundials_f*[!_mod].so.*
 %endif
 
 %files devel
@@ -752,13 +748,13 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %{_libdir}/libsundials_sunnonlinsol*.so
 %if 0%{?with_fortran}
 %{_libdir}/libsundials_f*[_mod].so
-%{_libdir}/libsundials_f*[!_mod].so
 %{_fmoddir}/%{name}/
+%{_includedir}/sundials/sundials_futils.h
 %if %{with pthread}
 %{_libdir}/libsundials_fnvecpthreads.so
 %endif
 %if 0%{?with_superlumt}
-%{_libdir}/libsundials_fsunlinsolsuperlumt.so
+%{_libdir}/libsundials_sunlinsolsuperlumt.so
 %endif
 %endif
 %{_includedir}/nvector/
@@ -776,7 +772,6 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %{_includedir}/sundials/sundials_band.h
 %{_includedir}/sundials/sundials_dense.h
 %{_includedir}/sundials/sundials_direct.h
-%{_includedir}/sundials/sundials_futils.h
 %{_includedir}/sundials/sundials_iterative.h
 %{_includedir}/sundials/sundials_linearsolver.h
 %{_includedir}/sundials/sundials_math.h
@@ -788,8 +783,17 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %{_includedir}/sundials/sundials_types.h
 %{_includedir}/sundials/sundials_version.h
 %{_includedir}/sundials/sundials_config.h
-%{_includedir}/sundials/sundials_fconfig.h
-%{_includedir}/sundials/sundials_fnvector.h
+%{_includedir}/sundials/sundials_base.hpp
+%{_includedir}/sundials/sundials_context.h
+%{_includedir}/sundials/sundials_context.hpp
+%{_includedir}/sundials/sundials_convertibleto.hpp
+%{_includedir}/sundials/sundials_linearsolver.hpp
+%{_includedir}/sundials/sundials_logger.h
+%{_includedir}/sundials/sundials_matrix.hpp
+%{_includedir}/sundials/sundials_nonlinearsolver.hpp
+%{_includedir}/sundials/sundials_nvector.hpp
+%{_includedir}/sundials/sundials_profiler.h
+%{_includedir}/sunmemory/sunmemory_system.h
 
 %if 0%{?with_openmpi}
 %files openmpi
@@ -805,11 +809,14 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %{_libdir}/openmpi/lib/libsundials_generic.so.*
 %{_libdir}/openmpi/lib/libsundials_nvecparallel.so.*
 %{_libdir}/openmpi/lib/libsundials_nvecparhyp.so.*
+%if 0%{?fedora}
+%ifarch %{arm} %{ix86}
 %if 0%{?with_petsc}
 %{_libdir}/openmpi/lib/libsundials_nvecpetsc.so.*
 %{_libdir}/openmpi/lib/libsundials_sunnonlinsolpetscsnes.so.*
 %endif
-%{_libdir}/openmpi/lib/libsundials_nvecmpimanyvector.so.*
+%endif
+%endif
 %if %{with pthread}
 %{_libdir}/openmpi/lib/libsundials_nvecmpipthreads.so.*
 %endif
@@ -824,12 +831,12 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %{_libdir}/openmpi/lib/libsundials_sunlinsol*.so.*
 %{_libdir}/openmpi/lib/libsundials_sunnonlinsol*.so.*
 %{_libdir}/openmpi/lib/libsundials_nvecmanyvector.so.*
+%{_libdir}/openmpi/lib/libsundials_nvecmpimanyvector.so.*
 %if %{with pthread}
 %{_libdir}/openmpi/lib/libsundials_nvecpthreads.so.*
 %endif
 %if 0%{?with_fortran}
 %{_libdir}/openmpi/lib/libsundials_f*[_mod].so.*
-%{_libdir}/openmpi/lib/libsundials_f*[!_mod].so.*
 %endif
 
 %files openmpi-devel
@@ -845,19 +852,22 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %{_includedir}/openmpi-%{_arch}/sunlinsol/
 %{_includedir}/openmpi-%{_arch}/sunmatrix/
 %{_includedir}/openmpi-%{_arch}/sunnonlinsol/
+%{_includedir}/openmpi-%{_arch}/sunmemory/
 %if 0%{?with_fortran}
 %{_fmoddir}/openmpi/%{name}/
 %{_libdir}/openmpi/lib/libsundials_f*[_mod].so
-%{_libdir}/openmpi/lib/libsundials_f*[!_mod].so
 %endif
 %{_libdir}/openmpi/lib/libsundials_generic.so
 %{_libdir}/openmpi/lib/libsundials_nvecparallel.so
 %{_libdir}/openmpi/lib/libsundials_nvecparhyp.so
+%if 0%{?fedora}
+%ifarch %{arm} %{ix86}
 %if 0%{?with_petsc}
 %{_libdir}/openmpi/lib/libsundials_nvecpetsc.so
 %{_libdir}/openmpi/lib/libsundials_sunnonlinsolpetscsnes.so
 %endif
-%{_libdir}/openmpi/lib/libsundials_nvecmpimanyvector.so
+%endif
+%endif
 %if %{with pthread}
 %{_libdir}/openmpi/lib/libsundials_nvecmpipthreads.so
 %{_libdir}/openmpi/lib/libsundials_nvecpthreads.so
@@ -873,6 +883,7 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %{_libdir}/openmpi/lib/libsundials_sunlinsol*.so
 %{_libdir}/openmpi/lib/libsundials_sunnonlinsol*.so
 %{_libdir}/openmpi/lib/libsundials_nvecmanyvector.so
+%{_libdir}/openmpi/lib/libsundials_nvecmpimanyvector.so
 %{_libdir}/openmpi/lib/cmake/sundials/
 %endif
 
@@ -890,11 +901,14 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %{_libdir}/mpich/lib/libsundials_generic.so.*
 %{_libdir}/mpich/lib/libsundials_nvecparallel.so.*
 %{_libdir}/mpich/lib/libsundials_nvecparhyp.so.*
+%if 0%{?fedora}
+%ifarch %{arm} %{ix86}
 %if 0%{?with_petsc}
 %{_libdir}/mpich/lib/libsundials_nvecpetsc.so.*
 %{_libdir}/mpich/lib/libsundials_sunnonlinsolpetscsnes.so.*
 %endif
-%{_libdir}/mpich/lib/libsundials_nvecmpimanyvector.so.*
+%endif
+%endif
 %if %{with pthread}
 %{_libdir}/mpich/lib/libsundials_nvecmpipthreads.so.*
 %endif
@@ -909,12 +923,12 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %{_libdir}/mpich/lib/libsundials_sunlinsol*.so.*
 %{_libdir}/mpich/lib/libsundials_sunnonlinsol*.so.*
 %{_libdir}/mpich/lib/libsundials_nvecmanyvector.so.*
+%{_libdir}/mpich/lib/libsundials_nvecmpimanyvector.so.*
 %if %{with pthread}
 %{_libdir}/mpich/lib/libsundials_nvecpthreads.so.*
 %endif
 %if 0%{?with_fortran}
 %{_libdir}/mpich/lib/libsundials_f*[_mod].so.*
-%{_libdir}/mpich/lib/libsundials_f*[!_mod].so.*
 %endif
 
 
@@ -930,20 +944,23 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %{_includedir}/mpich-%{_arch}/sunlinsol/
 %{_includedir}/mpich-%{_arch}/sunmatrix/
 %{_includedir}/mpich-%{_arch}/sunnonlinsol/
+%{_includedir}/mpich-%{_arch}/sunmemory/
 %if 0%{?with_fortran}
 %{_fmoddir}/mpich/%{name}/
 %{_libdir}/mpich/lib/libsundials_f*[_mod].so
-%{_libdir}/mpich/lib/libsundials_f*[!_mod].so
 %endif
 %{_libdir}/mpich/lib/*.a
 %{_libdir}/mpich/lib/libsundials_generic.so
 %{_libdir}/mpich/lib/libsundials_nvecparallel.so
 %{_libdir}/mpich/lib/libsundials_nvecparhyp.so
+%if 0%{?fedora}
+%ifarch %{arm} %{ix86}
 %if 0%{?with_petsc}
 %{_libdir}/mpich/lib/libsundials_nvecpetsc.so
 %{_libdir}/mpich/lib/libsundials_sunnonlinsolpetscsnes.so
 %endif
-%{_libdir}/mpich/lib/libsundials_nvecmpimanyvector.so
+%endif
+%endif
 %if %{with pthread}
 %{_libdir}/mpich/lib/libsundials_nvecmpipthreads.so
 %{_libdir}/mpich/lib/libsundials_nvecpthreads.so
@@ -959,6 +976,7 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %{_libdir}/mpich/lib/libsundials_sunlinsol*.so
 %{_libdir}/mpich/lib/libsundials_sunnonlinsol*.so
 %{_libdir}/mpich/lib/libsundials_nvecmanyvector.so
+%{_libdir}/mpich/lib/libsundials_nvecmpimanyvector.so
 %{_libdir}/mpich/lib/cmake/sundials/
 %endif
 
@@ -973,6 +991,26 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{_libdir}
 %doc sundials-%{version}/doc/arkode/*
 
 %changelog
+* Wed Apr 19 2023 Antonio Trande <sagitter@fedoraproject.org> - 6.5.1-2
+- Fix ctest commands
+
+* Wed Apr 19 2023 Antonio Trande <sagitter@fedoraproject.org> - 6.5.1-1
+- Release 6.5.1
+
+* Fri Mar 03 2023 Antonio Trande <sagitter@fedoraproject.org> - 5.8.0-15
+- Fix installed files in EPEL9
+
+* Fri Mar 03 2023 Antonio Trande <sagitter@fedoraproject.org> - 5.8.0-14
+- Enable only KLU64 in EPEL9
+
+* Fri Mar 03 2023 Antonio Trande <sagitter@fedoraproject.org> - 5.8.0-13
+- Fix PETSc support in EPEL9
+
+* Fri Feb 24 2023 Antonio Trande <sagitter@fedoraproject.org> - 5.8.0-12
+- Rebuild (rhbz#2171312)
+- Enable KLU-64 in EPEL9 (rhbz#20673760)
+- Disable PETSc support in 64-bit architectures
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild