Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lammps for openSUSE:Factory checked in at 2022-12-08 16:50:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lammps (Old) and /work/SRC/openSUSE:Factory/.lammps.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lammps" Thu Dec 8 16:50:32 2022 rev:22 rq:1041298 version:20201029 Changes: -------- --- /work/SRC/openSUSE:Factory/lammps/lammps.changes 2021-10-11 15:32:15.730907006 +0200 +++ /work/SRC/openSUSE:Factory/.lammps.new.1835/lammps.changes 2022-12-08 16:50:38.227314652 +0100 @@ -1,0 +2,21 @@ +Wed Dec 7 18:33:03 UTC 2022 - Stefan Brüns <[email protected]> + +- Add Conflicts and Provides to allow upgrade of python package + without conflict. +- Reenable Fortran tests. +- Cleanup spec file. +- Ignore test failures on ix86. + +------------------------------------------------------------------- +Wed Dec 7 03:39:24 UTC 2022 - Steve Kowalik <[email protected]> + +- Do not provide Python 2 package names for Python 3 packages. +- Skip Fortran tests for now. + +------------------------------------------------------------------- +Tue Nov 23 01:19:02 UTC 2021 - Steve Kowalik <[email protected]> + +- Switch to Python 3: + * Rename package to python3-lammps. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lammps.spec ++++++ --- /var/tmp/diff_new_pack.PUhugc/_old 2022-12-08 16:50:39.083319032 +0100 +++ /var/tmp/diff_new_pack.PUhugc/_new 2022-12-08 16:50:39.087319052 +0100 @@ -1,7 +1,7 @@ # # spec file for package lammps # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2017-2020 Christoph Junghans # # All modifications and additions to the file contributed by third parties @@ -29,7 +29,6 @@ Source1: https://github.com/google/googletest/archive/release-1.10.0.tar.gz BuildRequires: cmake BuildRequires: fftw3-devel -BuildRequires: fftw3-devel BuildRequires: gcc-c++ BuildRequires: gcc-fortran BuildRequires: gsl-devel @@ -42,7 +41,7 @@ BuildRequires: libpng-devel BuildRequires: ocl-icd-devel BuildRequires: opencl-headers -BuildRequires: python-devel +BuildRequires: python3-devel BuildRequires: voro++-devel BuildRequires: zlib-devel %ifnarch ppc64 %ix86 %{arm} @@ -50,7 +49,6 @@ BuildRequires: kokkos-devel >= 3.2 %endif Requires: %{name}-data -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale @@ -105,12 +103,15 @@ This package contains development headers and libraries for LAMMPS. -%package -n python-%{name} +%package -n python3-%{name} Summary: LAMMPS python module Group: Development/Languages/Python Requires: liblammps0 = %{version} +# File conflict, old package contained python3 module +Conflicts: python-%{name} <= %{version} +Provides: python-%{name}:%{python3_sitearch}/%{name}.py -%description -n python-%{name} +%description -n python3-%{name} LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale Atomic/Molecular Massively Parallel Simulator. @@ -165,7 +166,7 @@ -DPKG_VORONOI=ON \ -DPKG_GPU=ON -DGPU_API=OpenCL \ -DFFT=FFTW3 \ - -DPYTHON_INSTDIR=%{python_sitearch} \ + -DPYTHON_INSTDIR=%{python3_sitearch} \ -DCMAKE_INSTALL_SYSCONFDIR=/etc \ %ifnarch x86_64 %ix86 -DPKG_USER-INTEL=OFF \ @@ -184,11 +185,12 @@ # https://github.com/lammps/lammps/issues/2383, inject -msse2 on %ix86 to make test pass %ifarch %ix86 -%global testargs --exclude-regex AtomStyle +%ctest --exclude-regex 'AtomStyle|Fortran' || true +%ctest --tests-regex 'AtomStyle|Fortran' || true +%else +%ctest %endif -%ctest %{?testargs} - %post -n liblammps0 -p /sbin/ldconfig %postun -n liblammps0 -p /sbin/ldconfig @@ -212,8 +214,8 @@ %{_libdir}/pkgconfig/liblammps.pc %{_libdir}/cmake/LAMMPS -%files -n python-%{name} -%{python_sitearch}/%{name}.py +%files -n python3-%{name} +%{python3_sitearch}/%{name}.py %files data %license LICENSE
