Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package spooles for openSUSE:Factory checked in at 2023-10-25 18:02:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spooles (Old) and /work/SRC/openSUSE:Factory/.spooles.new.24901 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spooles" Wed Oct 25 18:02:32 2023 rev:2 rq:1120030 version:2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/spooles/spooles.changes 2022-06-18 22:06:01.687642323 +0200 +++ /work/SRC/openSUSE:Factory/.spooles.new.24901/spooles.changes 2023-10-25 18:03:14.671294221 +0200 @@ -1,0 +2,6 @@ +Tue Oct 24 08:19:51 UTC 2023 - Nicolas Morey <[email protected]> + +- Tune build to only build against the default openmpi version, + not against multiple flavors. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spooles.spec ++++++ --- /var/tmp/diff_new_pack.wtMtvA/_old 2023-10-25 18:03:15.215312518 +0200 +++ /var/tmp/diff_new_pack.wtMtvA/_new 2023-10-25 18:03:15.215312518 +0200 @@ -1,7 +1,7 @@ # -# spec file for package spooles +# spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,33 +29,20 @@ %endif %if "%{flavor}" == "openmpi" -%if 0%{?suse_version} >= 1550 -%define my_suffix -openmpi1 -%define mpi_flavor openmpi1 -%else %define my_suffix -openmpi %define mpi_flavor openmpi %endif -%define mpiprefix %{_libdir}/mpi/gcc/%{mpi_flavor} -%endif - -%if "%{flavor}" == "openmpi2" -%define my_suffix -openmpi2 -%define mpi_flavor openmpi2 -%define mpiprefix %{_libdir}/mpi/gcc/%{mpi_flavor} -%endif %{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}} %if %{with mpi} -%define my_prefix %{mpiprefix} +%define my_prefix %{openmpi_prefix} %define my_bindir %{my_prefix}/bin %define my_libdir %{my_prefix}/%{_lib}/ %define my_incdir %{my_prefix}/include/ %define my_datadir %{my_prefix}/share/ %endif - Name: spooles%{?my_suffix} Version: 2.2 Release: 0 @@ -70,7 +57,9 @@ Patch1: patch-spooles-shared-mpi Patch2: patch-spooles-I2Ohash-from-debian %if %{with mpi} -BuildRequires: %{mpi_flavor}-devel +# By pulling openmpi-macros-devel, +# we always get the current "default" implementation +BuildRequires: openmpi-macros-devel %endif %description @@ -82,6 +71,9 @@ %package -n %{libname}%{?my_suffix} Summary: A sparse matrix library Group: System/Libraries +%if %{with mpi} +%openmpi_requires +%endif %description -n %{libname}%{?my_suffix} SPOOLES is a library for solving sparse real and complex linear systems @@ -93,11 +85,13 @@ Summary: Header files for the SPOOLES library Group: Development/Libraries/C and C++ Requires: %{libname}%{?my_suffix} = %{version}-%{release} +%if %{with mpi} +%openmpi_devel_requires +%endif %description devel %{name}-devel provides the header file for the SPOOLES library. - %prep %setup -c -q %autopatch -p1 @@ -109,6 +103,7 @@ %else # openmpi +%setup_openmpi %make_build -f makeRPM-mpi all \ CC=%{my_bindir}/mpicc \ MPI_INSTALL_DIR=%{my_prefix} \ ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.wtMtvA/_old 2023-10-25 18:03:15.243313459 +0200 +++ /var/tmp/diff_new_pack.wtMtvA/_new 2023-10-25 18:03:15.247313594 +0200 @@ -1,5 +1,4 @@ <multibuild> <package>openmpi</package> - <package>openmpi2</package> </multibuild>
