Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package lammps for openSUSE:Factory checked
in at 2021-10-04 18:39:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lammps (Old)
and /work/SRC/openSUSE:Factory/.lammps.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lammps"
Mon Oct 4 18:39:40 2021 rev:20 rq:922659 version:20201029
Changes:
--------
--- /work/SRC/openSUSE:Factory/lammps/lammps.changes 2020-11-13
18:58:20.730066969 +0100
+++ /work/SRC/openSUSE:Factory/.lammps.new.2443/lammps.changes 2021-10-04
18:40:49.194140849 +0200
@@ -1,0 +2,5 @@
+Fri Oct 1 06:08:29 UTC 2021 - Nicolas Morey-Chaisemartin
<nmoreychaisemar...@suse.com>
+
+- Use openmpi macros to always build with the default openmpi version.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lammps.spec ++++++
--- /var/tmp/diff_new_pack.sy3Wae/_old 2021-10-04 18:40:50.106142331 +0200
+++ /var/tmp/diff_new_pack.sy3Wae/_new 2021-10-04 18:40:50.110142337 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lammps
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2017-2020 Christoph Junghans
#
# All modifications and additions to the file contributed by third parties
@@ -17,21 +17,6 @@
#
-# 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: 20201029
Release: 0
@@ -42,8 +27,6 @@
URL: https://lammps.sandia.gov
Source0:
https://github.com/lammps/lammps/archive/%{uversion}.tar.gz#/%{name}-%{uversion}.tar.gz
Source1:
https://github.com/google/googletest/archive/release-1.10.0.tar.gz
-BuildRequires: %{mpiver}
-BuildRequires: %{mpiver}-devel
BuildRequires: cmake
BuildRequires: fftw3-devel
BuildRequires: fftw3-devel
@@ -51,6 +34,7 @@
BuildRequires: gcc-fortran
BuildRequires: gsl-devel
BuildRequires: kim-api-devel >= 2.1
+BuildRequires: openmpi-macros-devel
BuildRequires: readline-devel
# for testing
BuildRequires: kim-api-examples
@@ -161,12 +145,11 @@
This subpackage contains LAMMPS's potential files
-
%prep
%setup -a 1 -q -n %{name}-%{uversion}
%build
-source %{_libdir}/mpi/gcc/%{mpiver}/bin/mpivars.sh
+%setup_openmpi
%{cmake} \
-C ../cmake/presets/all_on.cmake \
@@ -197,7 +180,7 @@
rm -rf %{buildroot}%{_datadir}/{applications,icons}/
%check
-export
LD_LIBRARY_PATH='%{buildroot}%{_libdir}:%{_libdir}/mpi/gcc/%{mpiver}/%{_lib}'
+%setup_openmpi
# https://github.com/lammps/lammps/issues/2383, inject -msse2 on %ix86 to make
test pass
%ifarch %ix86
