Require ptscotch-mpich-devel-parmetis

Remove obsolete conditionals
This commit is contained in:
Dave Love 2018-04-26 11:51:30 +01:00
parent 4ca9bce0bd
commit 7d2dff3ada
1 changed files with 6 additions and 12 deletions

View File

@ -11,13 +11,12 @@
Name: superlu_dist Name: superlu_dist
Version: 5.3.0 Version: 5.3.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: Solution of large, sparse, nonsymmetric systems of linear equations Summary: Solution of large, sparse, nonsymmetric systems of linear equations
License: BSD License: BSD
URL: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/ URL: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
Source0: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_dist_%version.tar.gz Source0: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_dist_%version.tar.gz
Source1: superlu_dist-make.inc Source1: superlu_dist-make.inc
# Make the parmetis support work with Scotch
BuildRequires: scotch-devel gcc-gfortran BuildRequires: scotch-devel gcc-gfortran
%if %{with openblas} %if %{with openblas}
BuildRequires: openblas-devel BuildRequires: openblas-devel
@ -37,15 +36,7 @@ BuildRequires: metis-devel
%bcond_without mpich %bcond_without mpich
%endif %endif
%ifarch s390 s390x
%if 0%{?fedora} >= 25
%bcond_without openmpi %bcond_without openmpi
%else
%bcond_with openmpi
%endif
%else
%bcond_without openmpi
%endif
%if %{with openmpi} %if %{with openmpi}
%global openmpi openmpi %global openmpi openmpi
@ -132,8 +123,8 @@ This is the mpich version.
%package mpich-devel %package mpich-devel
Summary: Development files for %name-mpich Summary: Development files for %name-mpich
# https://bugzilla.redhat.com/show_bug.cgi?id=1397192 (fixed in RHEL 7.4 beta) Requires: mpich-devel%{?_isa}
Requires: mpich-devel%{!?el7:%{?_isa}} Requires: ptscotch-mpich-devel%{?_isa} ptscotch-mpich-devel-parmetis%{?_isa}
Requires: %name-mpich%{?_isa} = %version-%release Requires: %name-mpich%{?_isa} = %version-%release
%description mpich-devel %description mpich-devel
@ -246,6 +237,9 @@ make clean
%changelog %changelog
* Thu Apr 26 2018 Dave Love <loveshack@fedoraproject.org> - 5.3.0-2
- Require ptscotch-mpich-devel-parmetis
* Tue Jan 30 2018 Dave Love <loveshack@fedoraproject.org> - 5.3.0-1 * Tue Jan 30 2018 Dave Love <loveshack@fedoraproject.org> - 5.3.0-1
- New version - New version
- Update sovar - Update sovar