[Arch-excludes] Architecture specific change in rpms/petsc.git

30 Sep 2017

The package rpms/petsc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/petsc.git/commit/?id=94f047a585c865f....
Change:
-ExcludeArch: aarch64
Thanks.
Full change:
============
commit f160378e93db484fcf9672d35da0cfd4b1f13851
Author: sagitter sagitter@fedoraproject.org
Date:   Wed Sep 27 20:32:30 2017 +0200
Update to 3.7.7

diff --git a/.gitignore b/.gitignore
index 353af3e..d50d131 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /petsc-3.7.4.tar.gz
 /petsc-3.7.5.tar.gz
 /petsc-3.7.6.tar.gz
+/petsc-3.7.7.tar.gz
diff --git a/petsc.spec b/petsc.spec
index 68ddddb..33e7c83 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -123,8 +123,8 @@
Name:    petsc
 Summary: Portable Extensible Toolkit for Scientific Computation
-Version: 3.7.6
-Release: 9%{?dist}
+Version: 3.7.7
+Release: 1%{?dist}
 License: BSD
 URL:     https://www.mcs.anl.gov/petsc
 Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%%7Bversion%7D.tar....
@@ -735,7 +735,7 @@ popd
 %install
 pushd %{name}-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/%{_arch}/lib/petsc/conf
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/conf
install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT%{_libdir}
 ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc.so
@@ -744,12 +744,14 @@ ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc.so.3.7
 install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 cp -a include/* $RPM_BUILD_ROOT%{_includedir}/%{name}
-install -pm 644 %{_arch}/lib/petsc/conf/petscrules $RPM_BUILD_ROOT%{_datadir}/%{name}/%{_arch}/lib/petsc/conf/
-install -pm 644 %{_arch}/lib/petsc/conf/petscvariables $RPM_BUILD_ROOT%{_datadir}/%{name}/%{_arch}/lib/petsc/conf/
-sed -e 's|%{_builddir}/%{name}-%{version}/%{name}-%{version}|%{_prefix}|g' -i $RPM_BUILD_ROOT%{_datadir}/%{name}/%{_arch}/lib/petsc/conf/petscvariables
-sed -e 's|%{_builddir}/%{name}-%{version}/%{name}-%{version}/%{_arch}/|%{_prefix}|g' -i $RPM_BUILD_ROOT%{_datadir}/%{name}/%{_arch}/lib/petsc/conf/petscvariables
-sed -e 's|-L%{_prefix}/%{_arch}/lib|-L%{_libdir}|g' -i $RPM_BUILD_ROOT%{_datadir}/%{name}/%{_arch}/lib/petsc/conf/petscvariables
-sed -e 's|-I%{_prefix}/%{_arch}/include|-I%{_includedir}|g' -i $RPM_BUILD_ROOT%{_datadir}/%{name}/%{_arch}/lib/petsc/conf/petscvariables
+install -pm 644 %{_arch}/lib/petsc/conf/petscrules $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/conf/
+install -pm 644 %{_arch}/lib/petsc/conf/petscvariables $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/conf/
+install -pm 644 lib/petsc/conf/rules $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/conf/
+install -pm 644 lib/petsc/conf/variables $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/conf/
+sed -e 's|%{_builddir}/%{name}-%{version}/%{name}-%{version}|%{_prefix}|g' -i $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/conf/petscvariables
+sed -e 's|%{_builddir}/%{name}-%{version}/%{name}-%{version}/%{_arch}/|%{_prefix}|g' -i $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/conf/petscvariables
+sed -e 's|-L%{_prefix}/%{_arch}/lib|-L%{_libdir}|g' -i $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/conf/petscvariables
+sed -e 's|-I%{_prefix}/%{_arch}/include|-I%{_includedir}|g' -i $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/conf/petscvariables
 popd
##Make a .pc file
@@ -778,7 +780,7 @@ EOF
 %if %{with arch64}
 pushd build64
 mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}/%{name}64
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}64/%{_arch}/lib/petsc/conf
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}64-%{version}/conf
install -pm 755 %{_arch}/lib/libpetsc64.* $RPM_BUILD_ROOT%{_libdir}
 ln -sf libpetsc64.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc64.so
@@ -787,12 +789,14 @@ ln -sf libpetsc64.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpetsc64.so.3.7
 install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}64
 cp -a include/* $RPM_BUILD_ROOT%{_includedir}/%{name}
-install -pm 644 %{_arch}/lib/petsc/conf/petscrules $RPM_BUILD_ROOT%{_datadir}/%{name}64/%{_arch}/lib/petsc/conf/
-install -pm 644 %{_arch}/lib/petsc/conf/petscvariables $RPM_BUILD_ROOT%{_datadir}/%{name}64/%{_arch}/lib/petsc/conf/
-sed -e 's|%{_builddir}/%{name}-%{version}/build64|%{_prefix}|g' -i $RPM_BUILD_ROOT%{_datadir}/%{name}64/%{_arch}/lib/petsc/conf/petscvariables
-sed -e 's|%{_builddir}/%{name}-%{version}/build64/%{_arch}/|%{_prefix}|g' -i $RPM_BUILD_ROOT%{_datadir}/%{name}64/%{_arch}/lib/petsc/conf/petscvariables
-sed -e 's|-L%{_prefix}/%{_arch}/lib|-L%{_libdir}|g' -i $RPM_BUILD_ROOT%{_datadir}/%{name}64/%{_arch}/lib/petsc/conf/petscvariables
-sed -e 's|-I%{_prefix}/%{_arch}/include/|-I%{_includedir}|g' -i $RPM_BUILD_ROOT%{_datadir}/%{name}64/%{_arch}/lib/petsc/conf/petscvariables
+install -pm 644 %{_arch}/lib/petsc/conf/petscrules $RPM_BUILD_ROOT%{_libdir}/%{name}64-%{version}/conf/
+install -pm 644 %{_arch}/lib/petsc/conf/petscvariables $RPM_BUILD_ROOT%{_libdir}/%{name}64-%{version}/conf/
+install -pm 644 lib/petsc/conf/rules $RPM_BUILD_ROOT%{_libdir}/%{name}64-%{version}/conf/
+install -pm 644 lib/petsc/conf/variables $RPM_BUILD_ROOT%{_libdir}/%{name}64-%{version}/conf/
+sed -e 's|%{_builddir}/%{name}-%{version}/build64|%{_prefix}|g' -i $RPM_BUILD_ROOT%{_libdir}/%{name}64-%{version}/conf/petscvariables
+sed -e 's|%{_builddir}/%{name}-%{version}/build64/%{_arch}/|%{_prefix}|g' -i $RPM_BUILD_ROOT%{_libdir}/%{name}64-%{version}/conf/petscvariables
+sed -e 's|-L%{_prefix}/%{_arch}/lib|-L%{_libdir}|g' -i $RPM_BUILD_ROOT%{_libdir}/%{name}64-%{version}/conf/petscvariables
+sed -e 's|-I%{_prefix}/%{_arch}/include/|-I%{_includedir}|g' -i $RPM_BUILD_ROOT%{_libdir}/%{name}64-%{version}/conf/petscvariables
 popd
##Make a .pc file
@@ -823,6 +827,7 @@ EOF
 pushd buildopenmpi_dir
 %{_openmpi_load}
 mkdir -p $RPM_BUILD_ROOT$MPI_LIB $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
+mkdir -p $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf
install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT$MPI_LIB
 ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so
@@ -830,6 +835,15 @@ ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so.3.7
install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
 cp -a include/* $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
+
+install -pm 644 %{_arch}/lib/petsc/conf/petscrules $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/
+install -pm 644 %{_arch}/lib/petsc/conf/petscvariables $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/
+install -pm 644 lib/petsc/conf/rules $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/
+install -pm 644 lib/petsc/conf/variables $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/
+sed -e 's|%{_builddir}/%{name}-%{version}/buildopenmpi_dir|%{_prefix}|g' -i $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/petscvariables
+sed -e 's|%{_builddir}/%{name}-%{version}/buildopenmpi_dir/%{_arch}/|%{_prefix}|g' -i $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/petscvariables
+sed -e 's|-L%{_prefix}/%{_arch}/lib|-L%{_libdir}/openmpi/lib|g' -i $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/petscvariables
+sed -e 's|-I%{_prefix}/%{_arch}/include|-I%{_includedir}/openmpi-%{_arch}/%{name}|g' -i $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/petscvariables
 %{_openmpi_unload}
 popd
 %endif
@@ -838,6 +852,7 @@ popd
 pushd buildmpich_dir
 %{_mpich_load}
 mkdir -p $RPM_BUILD_ROOT$MPI_LIB $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
+mkdir -p $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf
install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT$MPI_LIB
 ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so
@@ -845,6 +860,15 @@ ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so.3.7
install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
 cp -a include/* $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
+
+install -pm 644 %{_arch}/lib/petsc/conf/petscrules $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/
+install -pm 644 %{_arch}/lib/petsc/conf/petscvariables $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/
+install -pm 644 lib/petsc/conf/rules $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/
+install -pm 644 lib/petsc/conf/variables $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/
+sed -e 's|%{_builddir}/%{name}-%{version}/buildmpich_dir|%{_prefix}|g' -i $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/petscvariables
+sed -e 's|%{_builddir}/%{name}-%{version}/buildmpich_dir/%{_arch}/|%{_prefix}|g' -i $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/petscvariables
+sed -e 's|-L%{_prefix}/%{_arch}/lib|-L%{_libdir}/mpich/lib|g' -i $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/petscvariables
+sed -e 's|-I%{_prefix}/%{_arch}/include|-I%{_includedir}/mpich-%{_arch}/%{name}|g' -i $RPM_BUILD_ROOT$MPI_LIB/%{name}-%{version}/conf/petscvariables
 %{_mpich_unload}
 popd
 %endif
@@ -935,7 +959,7 @@ make -C buildmpich_dir test
%files devel
 %{_libdir}/pkgconfig/%{name}.pc
-%{_datadir}/%{name}/
+%{_libdir}/%{name}-%{version}/
 %{_libdir}/libpetsc.so
 %{_includedir}/%{name}/
@@ -950,7 +974,7 @@ make -C buildmpich_dir test
%files -n petsc64-devel
 %{_libdir}/pkgconfig/%{name}64.pc
-%{_datadir}/%{name}64/
+%{_libdir}/%{name}64-%{version}/
 %{_libdir}/libpetsc64.so
 %{_includedir}/%{name}64/
 %endif
@@ -962,6 +986,7 @@ make -C buildmpich_dir test
%files openmpi-devel
 %{_libdir}/openmpi/lib/libpetsc.so
+%{_libdir}/openmpi/lib/%{name}-%{version}/
 %{_includedir}/openmpi-%{_arch}/%{name}/
 %endif
@@ -972,10 +997,15 @@ make -C buildmpich_dir test
%files mpich-devel
 %{_libdir}/mpich/lib/libpetsc.so
+%{_libdir}/mpich/lib/%{name}-%{version}/
 %{_includedir}/mpich-%{_arch}/%{name}/
 %endif
%changelog
+* Tue Sep 26 2017 Antonio Trande sagitter@fedoraproject.org - 3.7.7-1
+- Update to 3.7.7
+- Move petscvariables/petscrules under a private directory of libdir
+
 * Wed Aug 16 2017 Antonio Trande <sagitterATfedoraproject.org> - 3.7.6-9
 - Rebuild for lapack 3.7.1 (moved to 64_ suffix)
diff --git a/sources b/sources
index 90094f9..d10a9a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (petsc-3.7.6.tar.gz) = a5a18bbd24034b22e7d4847bbf382502f92117b072b5a9bb0e2067a60c16eaa2edcae9c9b0c57f54047ecd36d307d668af5e3029759582cec77dd59070b4ebb0
+SHA512 (petsc-3.7.7.tar.gz) = 408b176536c66b24ceebcc09ba94682d776b157a3eb841fe976b576fd4dc6073e65e76814f95d40a48f8c49dce3f4132dde0249ace64335ad37d2b347f0ed46d
commit e36f8baaf3d71b484e4ed56b19e0a76a0b3f2b9b
Author: sagitter sagitter@fedoraproject.org
Date:   Wed Aug 16 12:23:59 2017 +0200
Rebuild for lapack 3.7.1 (moved to 64_ suffix)
diff --git a/petsc.spec b/petsc.spec
index 9243f12..68ddddb 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -124,7 +124,7 @@
 Name:    petsc
 Summary: Portable Extensible Toolkit for Scientific Computation
 Version: 3.7.6
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 URL:     https://www.mcs.anl.gov/petsc
 Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%%7Bversion%7D.tar....
@@ -498,8 +498,8 @@ pushd build64
 %endif
 %if %{with blas64}
 %ifnarch x86_64 %{ix86} armv7hl %{power64} aarch64
- --with-blas-lib="-lblas64" \
- --with-lapack-lib="-llapack64" \
+ --with-blas-lib="-lblas64_" \
+ --with-lapack-lib="-llapack64_" \
  --known-64-bit-blas-indices=1 \
 %else
  --with-blas-lapack-lib="-lopenblas64" \
@@ -814,7 +814,7 @@ Libs: -L%{_libdir}  -lpetsc64
 %ifarch x86_64 %{ix86} armv7hl %{power64} aarch64
 Libs.private: -lopenblas64 -lX11 -lpthread -lm -ldl
 %else
-Libs.private: -llapack64 -lblas64 -lX11 -lpthread -lm -ldl
+Libs.private: -llapack64_ -lblas64_ -lX11 -lpthread -lm -ldl
 %endif
 EOF
 %endif
@@ -976,6 +976,9 @@ make -C buildmpich_dir test
 %endif
%changelog
+* Wed Aug 16 2017 Antonio Trande <sagitterATfedoraproject.org> - 3.7.6-9
+- Rebuild for lapack 3.7.1 (moved to 64_ suffix)
+
 * Sun Aug 13 2017 Antonio Trande sagitter@fedoraproject.org - 3.7.6-8
 - Option for Fedora < 25 definitively removed
commit e132ea4fe91278d4fe53bc4f31c9ff6759f51a01
Author: sagitter sagitter@fedoraproject.org
Date:   Sun Aug 13 19:28:37 2017 +0200
Fix MPI paths
diff --git a/petsc.spec b/petsc.spec
index 7d6bc35..9243f12 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -958,21 +958,21 @@ make -C buildmpich_dir test
 %if %{with openmpi}
 %files openmpi
 %license buildopenmpi_dir/LICENSE
-%{_libmpidir}/libpetsc.so.*
+%{_libdir}/openmpi/lib/libpetsc.so.*
%files openmpi-devel
-%{_libmpidir}/libpetsc.so
-%{_incmpidir}/%{name}/
+%{_libdir}/openmpi/lib/libpetsc.so
+%{_includedir}/openmpi-%{_arch}/%{name}/
 %endif
%if %{with mpich}
 %files mpich
 %license buildmpich_dir/LICENSE
-%{_libmpichdir}/libpetsc.so.*
+%{_libdir}/mpich/lib/libpetsc.so.*
%files mpich-devel
-%{_libmpichdir}/libpetsc.so
-%{_incmpichdir}/%{name}/
+%{_libdir}/mpich/lib/libpetsc.so
+%{_includedir}/mpich-%{_arch}/%{name}/
 %endif
%changelog
commit 94f047a585c865f55bc396c0e98f107932f46977
Author: sagitter sagitter@fedoraproject.org
Date:   Sun Aug 13 19:07:31 2017 +0200
Option for Fedora < 25 definitively removed
diff --git a/petsc.spec b/petsc.spec
index 0b1c58f..7d6bc35 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -33,11 +33,6 @@
 %bcond_without openmpi
 %endif
-## blas is not available on fedora 24
-%if 0%{?fedora} && 0%{?fedora} < 25
-ExcludeArch: aarch64
-%endif
-
 %bcond_without blas
#
@@ -90,9 +85,6 @@ ExcludeArch: aarch64
 %endif
 %bcond_without ptscotch
 %bcond_without hypre
-
-%global _incmpidir %{_includedir}/openmpi-%{_arch}
-%global _libmpidir %{_libdir}/openmpi/lib
 %endif
%if %{with mpich}
@@ -107,9 +99,6 @@ ExcludeArch: aarch64
 %endif
 %bcond_without ptscotch
 %bcond_without hypre
-
-%global _incmpichdir %{_includedir}/mpich-%{_arch}
-%global _libmpichdir %{_libdir}/mpich/lib
 %endif
# 64bit-int libs not built
@@ -135,7 +124,7 @@ ExcludeArch: aarch64
 Name:    petsc
 Summary: Portable Extensible Toolkit for Scientific Computation
 Version: 3.7.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD
 URL:     https://www.mcs.anl.gov/petsc
 Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%%7Bversion%7D.tar....
@@ -987,6 +976,9 @@ make -C buildmpich_dir test
 %endif
%changelog
+* Sun Aug 13 2017 Antonio Trande sagitter@fedoraproject.org - 3.7.6-8
+- Option for Fedora < 25 definitively removed
+
 * Sun Aug 13 2017 Antonio Trande sagitter@fedoraproject.org - 3.7.6-7
 - Superlu_dist needs parmetis
 - Use MPI variables
commit 722a325d89837d6b55902c87aa9413e1d79f610b
Author: sagitter sagitter@fedoraproject.org
Date:   Sun Aug 13 15:02:16 2017 +0200
Use MPI variables
diff --git a/petsc.spec b/petsc.spec
index 6460e92..0b1c58f 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -34,7 +34,7 @@
 %endif
## blas is not available on fedora 24
-%if 0%{?fedora} < 25
+%if 0%{?fedora} && 0%{?fedora} < 25
 ExcludeArch: aarch64
 %endif
@@ -50,6 +50,11 @@ ExcludeArch: aarch64
 %endif
 #
+## SuperLUDIST needs parmetis
+%bcond_with superludist
+%bcond_with superlumt
+#
+
 # hdf5' is required by 'cgns'
 # hdf5 needs MPI
 %if 0%{?fedora} || 0%{?rhel} >= 7
@@ -130,7 +135,7 @@ ExcludeArch: aarch64
 Name:    petsc
 Summary: Portable Extensible Toolkit for Scientific Computation
 Version: 3.7.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD
 URL:     https://www.mcs.anl.gov/petsc
 Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%%7Bversion%7D.tar....
@@ -150,6 +155,9 @@ Patch3:  %{name}-disable_petscnagupgrade.patch
 %if %{with superlu}
 BuildRequires: SuperLU-devel
 %endif
+%if %{with superlumt}
+BuildRequires: SuperLUMT-devel
+%endif
 %if %{with sundials}
 BuildRequires: sundials-devel
 %endif
@@ -257,6 +265,9 @@ BuildRequires: MUMPS-openmpi-devel
 %if %{with sundials}
 BuildRequires: sundials-openmpi-devel
 %endif
+%if %{with superludist}
+BuildRequires: superlu_dist-openmpi-devel
+%endif
 %if %{with fftw}
 BuildRequires: fftw-devel
 BuildRequires: fftw-openmpi-devel
@@ -312,6 +323,9 @@ BuildRequires: MUMPS-mpich-devel
 %if %{with sundials}
 BuildRequires: sundials-mpich-devel
 %endif
+%if %{with superludist}
+BuildRequires: superlu_dist-mpich-devel
+%endif
 %if %{with hypre}
 BuildRequires: hypre-mpich-devel
 %endif
@@ -531,9 +545,9 @@ pushd buildopenmpi_dir
  --with-64-bit-indices=0 \
  --with-fortran-interfaces=1 \
  --with-windows-graphics=0 \
- --CC=%{_libdir}/openmpi/bin/mpicc \
- --CXX=%{_libdir}/openmpi/bin/mpicxx \
- --FC=%{_libdir}/openmpi/bin/mpif77 \
+ --CC=$MPI_BIN/mpicc \
+ --CXX=$MPI_BIN/mpicxx \
+ --FC=$MPI_BIN/mpif77 \
  --with-shared-ld=ld \
  --with-pic=1 \
  --with-clib-autodetect=0 \
@@ -559,39 +573,44 @@ pushd buildopenmpi_dir
 %endif
 %if %{with scalapack}
  --with-scalapack=1 \
- --with-scalapack-lib="-L%{_libmpidir} -lscalapack" \
+ --with-scalapack-lib="-L$MPI_LIB -lscalapack" \
  --with-scalapck-include="" \
 %endif
 %if %{with mpi}
  --with-mpi=1 \
- --with-mpi-compilers=%{_libdir}/openmpi/bin/mpicc \
- --with-mpiexec=%{_libdir}/openmpi/bin/mpiexec \
+ --with-mpi-compilers=$MPI_BIN/mpicc \
+ --with-mpiexec=$MPI_BIN/mpiexec \
  --with-mpiuni-fortran-binding=0 \
 %endif
 %if %{with cgns}
  --with-cgns=1 \
  --with-cgns-include="" \
- --with-cgns-lib="-L%{_libmpidir} -lhdf5 -lcgns" \
+ --with-cgns-lib="-L$MPI_LIB -lhdf5 -lcgns" \
 %endif
 %if %{with hdf5}
  --with-hdf5=1 \
  --with-hdf5-include="" \
- --with-hdf5-lib="-L%{_libmpidir} -lhdf5" \
+ --with-hdf5-lib="-L$MPI_LIB -lhdf5" \
 %endif
 %if %{with ptscotch}
  --with-ptscotch=1 \
  --with-ptscotch-include="" \
- --with-ptscotch-lib="-L%{_libmpidir} -lptscotch -lscotch -lptscotcherr -lscotcherr" \
+ --with-ptscotch-lib="-L$MPI_LIB -lptscotch -lscotch -lptscotcherr -lscotcherr" \
 %endif
 %if %{with mumps}
  --with-mumps=1 \
  --with-mumps-include="" \
- --with-mumps-lib="-L%{_libmpidir} -lmumps_common -ldmumps -lpord" \
+ --with-mumps-lib="-L$MPI_LIB -lmumps_common -ldmumps -lpord" \
 %endif
 %if %{with sundials}
  --with-sundials=1 \
  --with-sundials-include="" \
- --with-sundials-lib="-L%{_libmpidir} -lsundials_nvecparallel -lsundials_cvode" \
+ --with-sundials-lib="-L$MPI_LIB -lsundials_nvecparallel -lsundials_cvode" \
+%endif
+%if %{with superludist}
+ --with-superlu_dist=1 \
+ --with-superlu_dist-include=$MPI_INCLUDE/superlu_dist \
+ --with-superlu_dist-lib=-lsuperlu_dist \
 %endif
  --with-x=1 \
  --with-openmp=0 \
@@ -600,13 +619,13 @@ pushd buildopenmpi_dir
  --with-ssl=0 \
 %if %{with hypre}
  --with-hypre=1 \
- --with-hypre-include=%{_incmpidir}/hypre \
- --with-hypre-lib="-L%{_libmpidir} -lHYPRE" \
+ --with-hypre-include=$MPI_INCLUDE/hypre \
+ --with-hypre-lib="-L$MPI_LIB -lHYPRE" \
 %endif
 %if %{with fftw}
  --with-fftw=1 \
  --with-fftw-include="" \
- --with-fftw-lib="-L%{_libmpidir} -lfftw3_mpi -lfftw3" \
+ --with-fftw-lib="-L$MPI_LIB -lfftw3_mpi -lfftw3" \
 %endif
  --with-pthread=1 \
  --with-valgrind=1
@@ -632,9 +651,9 @@ pushd buildmpich_dir
  --with-64-bit-indices=0 \
  --with-fortran-interfaces=1 \
  --with-windows-graphics=0 \
- --CC=%{_libdir}/mpich/bin/mpicc \
- --CXX=%{_libdir}/mpich/bin/mpicxx \
- --FC=%{_libdir}/mpich/bin/mpif77 \
+ --CC=$MPI_BIN/mpicc \
+ --CXX=$MPI_BIN/mpicxx \
+ --FC=$MPI_BIN/mpif77 \
  --with-shared-ld=ld \
  --with-pic=1 \
  --with-clib-autodetect=0 \
@@ -660,39 +679,44 @@ pushd buildmpich_dir
 %endif
 %if %{with scalapack}
  --with-scalapack=1 \
- --with-scalapack-lib="-L%{_libmpichdir} -lscalapack" \
+ --with-scalapack-lib="-L$MPI_LIB -lscalapack" \
  --with-scalapck-include="" \
 %endif
 %if %{with mpi}
  --with-mpi=1 \
- --with-mpi-compilers=%{_libdir}/mpich/bin/mpicc \
- --with-mpiexec=%{_libdir}/mpich/bin/mpiexec \
+ --with-mpi-compilers=$MPI_BIN/mpicc \
+ --with-mpiexec=$MPI_BIN/mpiexec \
  --with-mpiuni-fortran-binding=0 \
 %endif
 %if %{with cgns}
  --with-cgns=1 \
  --with-cgns-include="" \
- --with-cgns-lib="-L%{_libmpichdir} -lhdf5 -lcgns" \
+ --with-cgns-lib="-L$MPI_LIB -lhdf5 -lcgns" \
 %endif
 %if %{with hdf5}
  --with-hdf5=1 \
  --with-hdf5-include="" \
- --with-hdf5-lib="-L%{_libmpichdir} -lhdf5" \
+ --with-hdf5-lib="-L$MPI_LIB -lhdf5" \
 %endif
 %if %{with ptscotch}
  --with-ptscotch=1 \
  --with-ptscotch-include="" \
- --with-ptscotch-lib="-L%{_libmpichdir} -lptscotch -lscotch -lptscotcherr -lscotcherr" \
+ --with-ptscotch-lib="-L$MPI_LIB -lptscotch -lscotch -lptscotcherr -lscotcherr" \
 %endif
 %if %{with mumps}
  --with-mumps=1 \
  --with-mumps-include="" \
- --with-mumps-lib="-L%{_libmpichdir} -lmumps_common -ldmumps -lpord" \
+ --with-mumps-lib="-L$MPI_LIB -lmumps_common -ldmumps -lpord" \
 %endif
 %if %{with sundials}
  --with-sundials=1 \
  --with-sundials-include="" \
- --with-sundials-lib="-L%{_libmpichdir} -lsundials_nvecparallel -lsundials_cvode" \
+ --with-sundials-lib="-L$MPI_LIB -lsundials_nvecparallel -lsundials_cvode" \
+%endif
+%if %{with superludist}
+ --with-superlu_dist=1 \
+ --with-superlu_dist-include=$MPI_INCLUDE/superlu_dist \
+ --with-superlu_dist-lib=-lsuperlu_dist \
 %endif
  --with-x=1 \
  --with-openmp=0 \
@@ -701,13 +725,13 @@ pushd buildmpich_dir
  --with-ssl=0 \
 %if %{with hypre}
  --with-hypre=1 \
- --with-hypre-include=%{_incmpichdir}/hypre \
- --with-hypre-lib="-L%{_libmpichdir} -lHYPRE" \
+ --with-hypre-include=$MPI_INCLUDE/hypre \
+ --with-hypre-lib="-L$MPI_LIB -lHYPRE" \
 %endif
 %if %{with fftw}
  --with-fftw=1 \
  --with-fftw-include="" \
- --with-fftw-lib="-L%{_libmpichdir} -lfftw3_mpi -lfftw3" \
+ --with-fftw-lib="-L$MPI_LIB -lfftw3_mpi -lfftw3" \
 %endif
  --with-pthread=1 \
  --with-valgrind=1
@@ -808,27 +832,31 @@ EOF
%if %{with openmpi}
 pushd buildopenmpi_dir
-mkdir -p $RPM_BUILD_ROOT%{_libmpidir} $RPM_BUILD_ROOT%{_incmpidir}/%{name}
+%{_openmpi_load}
+mkdir -p $RPM_BUILD_ROOT$MPI_LIB $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
-install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT%{_libmpidir}
-ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT%{_libmpidir}/libpetsc.so
-ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT%{_libmpidir}/libpetsc.so.3.7
+install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT$MPI_LIB
+ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so
+ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so.3.7
-install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT%{_incmpidir}/%{name}
-cp -a include/* $RPM_BUILD_ROOT%{_incmpidir}/%{name}
+install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
+cp -a include/* $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
+%{_openmpi_unload}
 popd
 %endif
%if %{with mpich}
 pushd buildmpich_dir
-mkdir -p $RPM_BUILD_ROOT%{_libmpichdir} $RPM_BUILD_ROOT%{_incmpichdir}/%{name}
+%{_mpich_load}
+mkdir -p $RPM_BUILD_ROOT$MPI_LIB $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
-install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT%{_libmpichdir}
-ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT%{_libmpichdir}/libpetsc.so
-ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT%{_libmpichdir}/libpetsc.so.3.7
+install -pm 755 %{_arch}/lib/libpetsc.* $RPM_BUILD_ROOT$MPI_LIB
+ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so
+ln -sf libpetsc.so.%{version} $RPM_BUILD_ROOT$MPI_LIB/libpetsc.so.3.7
-install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT%{_incmpichdir}/%{name}
-cp -a include/* $RPM_BUILD_ROOT%{_incmpichdir}/%{name}
+install -pm 644 %{_arch}/include/*.h $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
+cp -a include/* $RPM_BUILD_ROOT$MPI_INCLUDE/%{name}
+%{_mpich_unload}
 popd
 %endif
@@ -889,7 +917,7 @@ make -C build64 test
%if %{with openmpi}
 %{_openmpi_load}
-export LD_LIBRARY_PATH=%{_libmpidir}:%{_libdir}:%{_builddir}/%{name}-%{version}/buildopenmpi_dir/%{_arch}/lib
+export LD_LIBRARY_PATH=$MPI_LIB:%{_libdir}:%{_builddir}/%{name}-%{version}/buildopenmpi_dir/%{_arch}/lib
 export PETSC_DIR=%{_builddir}/%{name}-%{version}/buildopenmpi_dir
 export PETSC_ARCH=%{_arch}
 export MPI_INTERFACE_HOSTNAME=localhost
@@ -901,7 +929,7 @@ make -C buildopenmpi_dir test
 %if 0%{?fedora} || 0%{?rhel} >= 7
 %if %{with mpich}
 %{_mpich_load}
-export LD_LIBRARY_PATH=%{_libmpichdir}:%{_libdir}:%{_builddir}/%{name}-%{version}/buildmpich_dir/%{_arch}/lib
+export LD_LIBRARY_PATH=$MPI_LIB:%{_libdir}:%{_builddir}/%{name}-%{version}/buildmpich_dir/%{_arch}/lib
 export PETSC_DIR=%{_builddir}/%{name}-%{version}/buildmpich_dir
 export PETSC_ARCH=%{_arch}
 export MPI_INTERFACE_HOSTNAME=localhost
@@ -959,6 +987,10 @@ make -C buildmpich_dir test
 %endif
%changelog
+* Sun Aug 13 2017 Antonio Trande sagitter@fedoraproject.org - 3.7.6-7
+- Superlu_dist needs parmetis
+- Use MPI variables
+
 * Thu Aug 03 2017 Fedora Release Engineering releng@fedoraproject.org - 3.7.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
commit 9af9a19adfadd73ce048efa899645dfc61daae30
Author: Fedora Release Engineering releng@fedoraproject.org
Date:   Thu Aug 3 05:52:20 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/petsc.spec b/petsc.spec
index e8c7ccb..6460e92 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -130,7 +130,7 @@ ExcludeArch: aarch64
 Name:    petsc
 Summary: Portable Extensible Toolkit for Scientific Computation
 Version: 3.7.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 URL:     https://www.mcs.anl.gov/petsc
 Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%%7Bversion%7D.tar....
@@ -959,6 +959,9 @@ make -C buildmpich_dir test
 %endif
%changelog
+* Thu Aug 03 2017 Fedora Release Engineering releng@fedoraproject.org - 3.7.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
 * Thu Jul 27 2017 Fedora Release Engineering releng@fedoraproject.org - 3.7.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit 13559129a63a78b233b323d403a674d68ba99d00
Author: Fedora Release Engineering releng@fedoraproject.org
Date:   Thu Jul 27 07:19:17 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/petsc.spec b/petsc.spec
index 5a5d51c..e8c7ccb 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -130,7 +130,7 @@ ExcludeArch: aarch64
 Name:    petsc
 Summary: Portable Extensible Toolkit for Scientific Computation
 Version: 3.7.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 URL:     https://www.mcs.anl.gov/petsc
 Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%%7Bversion%7D.tar....
@@ -959,6 +959,9 @@ make -C buildmpich_dir test
 %endif
%changelog
+* Thu Jul 27 2017 Fedora Release Engineering releng@fedoraproject.org - 3.7.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Wed May 17 2017 Antonio Trande sagitter@fedoraproject.org - 3.7.6-4
 - Fix Requires packages

    

2024

2023

2022

2021

2020

2019

2018

2017

[Arch-excludes] Architecture specific change in rpms/petsc.git