rpms
/
sundials
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 3.1.1

This commit is contained in:
sagitter 2018-05-14 13:57:06 +02:00
parent 84523661ac
commit 8f0a496edc
4 changed files with 66 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ sundials-2.3.0.tar.gz
/sundials-2.7.0_pkgconfig_files.tar.gz
/sundials-3.0.0.tar.gz
/sundials-3.1.0.tar.gz
/sundials-3.1.1.tar.gz

2
sources
View File

@ -1 +1 @@
SHA512 (sundials-3.1.0.tar.gz) = 288427e00f58c512583cc14d81385e82b0fdeaa4e9adca588a108ad0752341b7be62c9fa2740924ec733e3e0d5794f305dc582fc72e244e675e5ea00ac0d08ca
SHA512 (sundials-3.1.1.tar.gz) = 3e8fc7183c5503943f1ba00c73b04c1614a48b6e6cb90559ec5481f9acffaa19acd97bd961611b251ebdc032f1a13f0919b0ab0cdfe9d9b4ddc99d40bef5719f

0
sundials-3.0.0-set_superlumt_name.patch → sundials-3.1.1-set_superlumt_name.patch
View File

97
sundials.spec
View File

@ -6,16 +6,6 @@
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
%endif
# openblas available on these architectures.
%if 0%{?fedora} && 0%{?fedora} > 26
%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64 s390x}
%else
%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
%endif
%if 0%{?rhel}
%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
%endif
## Define if use openmpi or not
%if 0%{?fedora} < 28
## Exclude MPI builds on s390x
@ -58,8 +48,8 @@
Summary: Suite of nonlinear solvers
Name: sundials
Version: 3.1.0
Release: 5%{?dist}
Version: 3.1.1
Release: 1%{?dist}
# SUNDIALS is licensed under BSD with some additional (but unrestrictive) clauses.
# Check the file 'LICENSE' for details.
License: BSD
@ -68,7 +58,7 @@ URL: http://www.llnl.gov/casc/sundials/
Source0: https://computation.llnl.gov/projects/sundials/download/sundials-%{version}.tar.gz
# This patch rename superLUMT library
Patch0: %{name}-3.0.0-set_superlumt_name.patch
Patch0: %{name}-%{version}-set_superlumt_name.patch
BuildRequires: gcc-gfortran
BuildRequires: suitesparse-devel
@ -128,9 +118,14 @@ This package contains the C, CXX, F77 example files.
Summary: Suite of nonlinear solvers
Group: Development/Libraries
BuildRequires: openmpi-devel
%if 0%{?rhel} || 0%{?fedora} > 28
BuildRequires: hypre-openmpi-devel
%else
%ifnarch s390x
BuildRequires: hypre-openmpi-devel
%endif
%endif
Requires: openmpi
Requires: gcc-gfortran%{?_isa}
%description openmpi
@ -165,9 +160,13 @@ This package contains the C, CXX, F77 example files.
Summary: Suite of nonlinear solvers
Group: Development/Libraries
BuildRequires: mpich-devel
%if 0%{?rhel} || 0%{?fedora} > 28
BuildRequires: hypre-mpich-devel
%else
%ifnarch s390x
BuildRequires: hypre-mpich-devel
%endif
%endif
Requires: mpich
Requires: gcc-gfortran%{?_isa}
%description mpich
@ -378,12 +377,20 @@ export LIBSUPERLUMTLINK=
%endif
## Hypre
%if 0%{?with_hypre}
%if 0%{?fedora} <= 28
%ifarch s390x
export LIBHYPRELINK=
%else
export LIBHYPRELINK="-L$MPI_LIB -lHYPRE"
%endif
%endif
%endif
%if 0%{?with_hypre}
%if 0%{?rhel} || 0%{?fedora} > 28
export LIBHYPRELINK="-L$MPI_LIB -lHYPRE"
%endif
%endif
##
%if %{with debug}
@ -432,8 +439,17 @@ cmake \
-DSUPERLUMT_LIBRARY_DIR:PATH=%{_libdir} \
-DSUPERLUMT_THREAD_TYPE:STRING=OpenMP \
%endif
%ifnarch s390x
%if 0%{?with_hypre}
%if 0%{?fedora} <= 28
%ifarch s390x
-DHYPRE_ENABLE:BOOL=OFF \
%else
-DHYPRE_ENABLE:BOOL=ON \
-DHYPRE_INCLUDE_DIR:PATH=$MPI_INCLUDE/hypre \
-DHYPRE_LIBRARY_DIR:PATH=$MPI_LIB \
%endif
%endif
%if 0%{?rhel} || 0%{?fedora} > 28
-DHYPRE_ENABLE:BOOL=ON \
-DHYPRE_INCLUDE_DIR:PATH=$MPI_INCLUDE/hypre \
-DHYPRE_LIBRARY_DIR:PATH=$MPI_LIB \
@ -493,20 +509,21 @@ export LIBSUPERLUMTLINK=-lsuperlumt_d
export LIBSUPERLUMTLINK=
%endif
## Hypre
%if 0%{?fedora}
%ifnarch s390x
%if 0%{?with_hypre}
%if 0%{?fedora} <= 28
%ifarch s390x
export LIBHYPRELINK=
%else
export LIBHYPRELINK="-L$MPI_LIB -lHYPRE"
%endif
%endif
%endif
%if 0%{?el6}
%ifnarch ppc64
%if 0%{?with_hypre}
%if 0%{?rhel} || 0%{?fedora} > 28
export LIBHYPRELINK="-L$MPI_LIB -lHYPRE"
%endif
%endif
%endif
##
%if %{with debug}
@ -561,23 +578,21 @@ cmake \
-DSUPERLUMT_LIBRARY_DIR:PATH=%{_libdir} \
-DSUPERLUMT_THREAD_TYPE:STRING=OpenMP \
%endif
%if 0%{?fedora}
%ifnarch s390x
%if 0%{?with_hypre}
%if 0%{?fedora} <= 28
%ifarch s390x
-DHYPRE_ENABLE:BOOL=OFF \
%else
-DHYPRE_ENABLE:BOOL=ON \
-DHYPRE_INCLUDE_DIR:PATH=$MPI_INCLUDE/hypre \
-DHYPRE_LIBRARY_DIR:PATH=$MPI_LIB \
%endif
%endif
%endif
%if 0%{?el6}
%ifnarch ppc64
%if 0%{?with_hypre}
%if 0%{?rhel} || 0%{?fedora} > 28
-DHYPRE_ENABLE:BOOL=ON \
-DHYPRE_INCLUDE_DIR:PATH=$MPI_INCLUDE/hypre \
-DHYPRE_LIBRARY_DIR:PATH=$MPI_LIB \
%endif
%endif
%endif
-DKLU_ENABLE=ON -DKLU_LIBRARY_DIR:PATH=%{_libdir} -DKLU_INCLUDE_DIR:PATH=%{_includedir}/suitesparse \
-DEXAMPLES_INSTALL:BOOL=OFF -Wno-dev ..
@ -773,9 +788,8 @@ popd
%endif ##if with_sercheck
%files
%{!?_licensedir:%global license %doc}
%license sundials-%{version}/LICENSE
%doc sundials-%{version}/README sundials-%{version}/src/README-*
%doc sundials-%{version}/README.md sundials-%{version}/src/README-*
%{_libdir}/libsundials_nvecserial.so.*
%{_libdir}/libsundials_cvode.so.*
%{_libdir}/libsundials_cvodes.so.*
@ -794,9 +808,8 @@ popd
%{_libdir}/libsundials_nvecopenmp.so.*
%files doc
%{!?_licensedir:%global license %doc}
%license sundials-%{version}/LICENSE
%doc sundials-%{version}/README
%doc sundials-%{version}/README.md
%doc sundials-%{version}/doc/cvode/cv_guide.pdf
%doc sundials-%{version}/doc/kinsol/kin_guide.pdf
%doc sundials-%{version}/doc/cvodes/cvs_guide.pdf
@ -837,20 +850,28 @@ popd
%if 0%{?with_openmpi}
%files openmpi
%license sundials-%{version}/LICENSE
%doc sundials-%{version}/README sundials-%{version}/src/README-*
%doc sundials-%{version}/README.md sundials-%{version}/src/README-*
%{_libdir}/openmpi/lib/libsundials_nvecparallel.so.*
%{_libdir}/openmpi/lib/libsundials_fnvecparallel.so.*
%if 0%{?rhel} || 0%{?fedora} > 28
%{_libdir}/openmpi/lib/libsundials_nvecparhyp.so.*
%else
%ifnarch s390x
%{_libdir}/openmpi/lib/libsundials_nvecparhyp.so.*
%endif
%endif
%files openmpi-devel
%{_includedir}/openmpi-%{_arch}/nvector/nvector_parallel.h
%{_libdir}/openmpi/lib/libsundials_nvecparallel.so
%{_libdir}/openmpi/lib/libsundials_fnvecparallel.so
%if 0%{?rhel} || 0%{?fedora} > 28
%{_libdir}/openmpi/lib/libsundials_nvecparhyp.so
%else
%ifnarch s390x
%{_libdir}/openmpi/lib/libsundials_nvecparhyp.so
%endif
%endif
%files openmpi-samples
%{_libdir}/openmpi/lib/sundials-%{version}/
@ -858,29 +879,39 @@ popd
%if 0%{?with_mpich}
%files mpich
%{!?_licensedir:%global license %doc}
%license sundials-%{version}/LICENSE
%doc sundials-%{version}/README sundials-%{version}/src/README-*
%doc sundials-%{version}/README.md sundials-%{version}/src/README-*
%{_libdir}/mpich/lib/libsundials_nvecparallel.so.*
%{_libdir}/mpich/lib/libsundials_fnvecparallel.so.*
%if 0%{?rhel} || 0%{?fedora} > 28
%{_libdir}/mpich/lib/libsundials_nvecparhyp.so.*
%else
%ifnarch s390x
%{_libdir}/mpich/lib/libsundials_nvecparhyp.so.*
%endif
%endif
%{_libdir}/mpich/lib/sundials-%{version}/
%files mpich-devel
%{_includedir}/mpich-%{_arch}/nvector/nvector_parallel.h
%{_libdir}/mpich/lib/libsundials_nvecparallel.so
%{_libdir}/mpich/lib/libsundials_fnvecparallel.so
%if 0%{?rhel} || 0%{?fedora} > 28
%{_libdir}/mpich/lib/libsundials_nvecparhyp.so
%else
%ifnarch s390x
%{_libdir}/mpich/lib/libsundials_nvecparhyp.so
%endif
%endif
%files mpich-samples
%{_libdir}/mpich/lib/sundials-%{version}/
%endif
%changelog
* Sun May 13 2018 Antonio Trande <sagitterATfedoraproject.org> - 3.1.1-1
- Update to 3.1.1
* Fri May 04 2018 Antonio Trande <sagitterATfedoraproject.org> - 3.1.0-5
- Rebuild for hypre-2.14.0