- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -4,3 +4,5 @@
 /superlu_dist_5.4.0.tar.gz
 /superlu_dist_6.0.0.tar.gz
 /superlu_dist_6.1.0.tar.gz
+/superlu_dist_6.1.1.tar.gz
+/superlu_dist_6.3.1.tar.gz

sources

@@ -1 +1 @@
-SHA512 (superlu_dist_6.1.0.tar.gz) = dde1f8f47d2f2ff58f2421b563770ccd08b8ff1b5a2386d212554e6a283fd6a717dc2a20a31315727a2063e0c382a7fd94105ec608a6c99e54a68aace1bd7f3b
+SHA512 (superlu_dist_6.1.1.tar.gz) = a91ec7557d213541b964ab7ee52ceb7c8908487d4266c6bb920fbba822ae7060dbc40dee86dfb5bafb46f4a8be7fa21ff5b5a06ac1db7e4ce981f873dfa0ee56

superlu_dist-make.inc

@@ -18,7 +18,6 @@
 SuperLUroot	=
 DSUPERLULIB   	= $(SuperLUroot)/SRC/libsuperlu_dist.a
 BLASDEF		= -DUSE_VENDOR_BLAS
-BLASLIB		= -lopenblas
 
 LIBS		= $(DSUPERLULIB) -lptscotchparmetis -lmetis -lscotch \
 -lptscotch -lptscotcherr -lptscotcherrexit $(BLASLIB)

superlu_dist.spec

@@ -3,11 +3,12 @@
 # MIT licence, per Fedora policy.
 
 # Following scalapack
-%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
-%ifarch %{openblas_arches}
-%bcond_without openblas
+%bcond_without optimized_blas
+
+%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
+%global blaslib flexiblas
 %else
-%bcond_with openblas
+%global blaslib openblas
 %endif
 
 %bcond_without check
@@ -18,8 +19,12 @@
 %endif
 
 Name:          superlu_dist
-Version:       6.1.0
-Release:       3%{?dist}
+# 6.2.0 fails with
+# superlu_defs.h:94:10: fatal error: superlu_FortranCInterface.h: No such file or directory
+# 6.3.1 has API/ABI change
+Version:       6.1.1
+Release:       8%{?dist}
+Epoch:	       1
 Summary:       Solution of large, sparse, nonsymmetric systems of linear equations
 License:       BSD
 URL:           http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
@@ -27,10 +32,11 @@ Source0:       http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_dist_%version.t
 Source1:       superlu_dist-make.inc
 # Use CFLAGS in INSTALL/Makefile (was only failing on some targets)
 Patch1:	       superlu_dist-inst.patch
+BuildRequires: make
 BuildRequires: scotch-devel
 BuildRequires: %{?dts}gcc-c++
-%if %{with openblas}
-BuildRequires: openblas-devel
+%if %{with optimized_blas}
+BuildRequires: %{blaslib}-devel
 # [else] Probably not worth a bundled provides for the bundled partial cblas.
 %endif
 # The test program runs if we link with -lmetis but crashes if linked with
@@ -63,7 +69,7 @@ BuildRequires: metis-devel
 # For library soname.  Start at one in case we need the incompatible
 # v4 packaged separately.
 %global major 1
-%global minor 3
+%global minor 4
 %global miner 0
 %global sover %major.%minor.%miner
 
@@ -105,10 +111,12 @@ This is the openmpi version.
 
 %package openmpi-devel
 Summary: Development files for %name-openmpi
-BuildRequires: openmpi-devel ptscotch-openmpi-devel-parmetis
+# ptscotch-openmpi-devel-parmetis is missing from RHEL8 for some reason
+# https://bugzilla.redhat.com/show_bug.cgi?id=1750180
+BuildRequires: openmpi-devel %{!?el8:ptscotch-openmpi-devel-parmetis}
 BuildRequires: ptscotch-openmpi-devel
 Requires: openmpi-devel%{?_isa}
-Requires: %name-openmpi%{?_isa} = %version-%release
+Requires: %name-openmpi%{?_isa} = %epoch:%version-%release
 
 %description openmpi-devel
 Development files for %name-openmpi
@@ -136,7 +144,7 @@ This is the mpich version.
 Summary: Development files for %name-mpich
 Requires: mpich-devel%{?_isa}
 Requires: ptscotch-mpich-devel%{?_isa} ptscotch-mpich-devel-parmetis%{?_isa}
-Requires: %name-mpich%{?_isa} = %version-%release
+Requires: %name-mpich%{?_isa} = %epoch:%version-%release
 
 %description mpich-devel
 Development files for %name-mpich
@@ -159,8 +167,8 @@ openmpi) %_openmpi_load ;;
 mpich) %_mpich_load ;;
 esac
 find -name \*.[oa] | xargs rm 2>/dev/null || true # no "clean" target
-%if %{with openblas}
-make SuperLUroot=$(pwd) INCLUDEDIR=$(pwd)/SRC V=1
+%if %{with optimized_blas}
+make SuperLUroot=$(pwd) BLASLIB=-l%{blaslib} INCLUDEDIR=$(pwd)/SRC V=1
 %else
 make blaslib HEADER=. BLASLIB='../libblas.a' INCLUDEDIR=%_includedir V=1
 make SuperLUroot=$(pwd) BLASDEF= BLASLIB='../libblas.a' INCLUDEDIR=$(pwd)/SRC V=1
@@ -170,11 +178,9 @@ pushd tmp
 ar x ../SRC/libsuperlu_dist.a
 mpicxx -shared -Wl,-soname=libsuperlu_dist.so.%major \
       -o ../$m/libsuperlu_dist.so.%sover *.o -fopenmp \
-       -lptscotchparmetis -lscotchmetis -lscotch -lptscotch \
-       -lptscotcherr -lptscotcherrexit \
-%if %{with openblas}
-      -lopenblas \
-%endif
+      -lptscotchparmetis -lscotchmetis -lscotch -lptscotch \
+      -lptscotcherr -lptscotcherrexit \
+      %{?with_optimized_blas:-l%{blaslib}} \
       %{?__global_ldflags}
 popd
 case $m in
@@ -253,6 +259,34 @@ make clean
 
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:6.1.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:6.1.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Aug 28 2020 Iñaki Úcar <iucar@fedoraproject.org> - 1:6.1.1-6
+- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:6.1.1-5
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:6.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Apr 13 2020 Dave Love <loveshack@fedoraproject.org> - 1:6.1.1-3
+- Introduce epoch and revert incompatible change to 6.3.1
+
+* Thu Apr  9 2020 Dave Love <loveshack@fedoraproject.org> - 6.3.1-1
+- New version
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Sep 12 2019 Dave Love <loveshack@fedoraproject.org> - 6.1.1-1
+- New version
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild