Hello community, here is the log from the commit of package lammps for openSUSE:Factory checked in at 2019-11-03 12:14:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lammps (Old) and /work/SRC/openSUSE:Factory/.lammps.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lammps" Sun Nov 3 12:14:48 2019 rev:14 rq:744757 version:20180807 Changes: -------- --- /work/SRC/openSUSE:Factory/lammps/lammps.changes 2019-09-09 23:42:46.645309468 +0200 +++ /work/SRC/openSUSE:Factory/.lammps.new.2990/lammps.changes 2019-11-03 12:14:50.416800841 +0100 @@ -1,0 +2,5 @@ +Fri Nov 1 02:45:27 UTC 2019 - Christoph Junghans <[email protected]> + +- generify used mpi version + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lammps.spec ++++++ --- /var/tmp/diff_new_pack.UtieYq/_old 2019-11-03 12:14:52.660804033 +0100 +++ /var/tmp/diff_new_pack.UtieYq/_new 2019-11-03 12:14:52.664804039 +0100 @@ -16,6 +16,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# Build with OpenMPI +%if 0%{?sle_version} == 0 +%define mpiver openmpi2 +%else +%if 0%{?sle_version} <= 120300 +%define mpiver openmpi +%else + %if 0%{?sle_version} <= 150000 + %define mpiver openmpi2 + %else + %define mpiver openmpi3 + %endif +%endif +%endif + Name: lammps Version: 20180807 %define uversion stable_7Aug2019 @@ -32,7 +47,8 @@ BuildRequires: gcc-fortran BuildRequires: libpng-devel BuildRequires: libjpeg-devel -BuildRequires: openmpi-devel +BuildRequires: %{mpiver} +BuildRequires: %{mpiver}-devel BuildRequires: python-devel BuildRequires: fftw3-devel BuildRequires: voro++-devel @@ -144,7 +160,7 @@ %setup -a 1 -q -n %{name}-%{uversion} %build -source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh +source %{_libdir}/mpi/gcc/%{mpiver}/bin/mpivars.sh %{cmake} \ -C ../cmake/presets/all_on.cmake \ @@ -164,7 +180,7 @@ %cmake_install %check -LD_LIBRARY_PATH='%{buildroot}/%{_libdir}:%{_libdir}/mpi/gcc/openmpi/%{_lib}' make -C build %{?_smp_mflags} test CTEST_OUTPUT_ON_FAILURE=1 +LD_LIBRARY_PATH='%{buildroot}/%{_libdir}:%{_libdir}/mpi/gcc/%{mpiver}/%{_lib}' make -C build %{?_smp_mflags} test CTEST_OUTPUT_ON_FAILURE=1 %post -n liblammps0 -p /sbin/ldconfig %postun -n liblammps0 -p /sbin/ldconfig
