From 1d7daf1cfc2a2b714377bc7588d3caccfe70f8366cf73a85675ca8fc71b08421 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 10 Jun 2022 12:51:53 +0000 Subject: [PATCH 1/6] - Dropping openmpi1/2/3 flavors from default as these have been dropped from oS:Factory. OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=59 --- _multibuild | 9 +-------- mumps.changes | 6 ++++++ mumps.spec | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/_multibuild b/_multibuild index 65adc9e..ebafd49 100644 --- a/_multibuild +++ b/_multibuild @@ -1,16 +1,9 @@ serial - openmpi1 - openmpi2 - openmpi3 openmpi4 mvapich2 scotch-serial - scotch-openmpi1 - scotch-openmpi2 - gnu-openmpi-hpc - gnu-openmpi2-hpc - gnu-openmpi3-hpc + scotch-openmpi4 gnu-openmpi4-hpc gnu-mvapich2-hpc gnu-mpich-hpc diff --git a/mumps.changes b/mumps.changes index d1b644c..77155d2 100644 --- a/mumps.changes +++ b/mumps.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 10 12:49:55 UTC 2022 - Egbert Eich + +- Dropping openmpi1/2/3 flavors from default as these have been + dropped from oS:Factory. + ------------------------------------------------------------------- Fri Mar 26 20:24:52 UTC 2021 - Egbert Eich diff --git a/mumps.spec b/mumps.spec index 49c8261..c112bf1 100644 --- a/mumps.spec +++ b/mumps.spec @@ -1,7 +1,7 @@ # -# spec file for package mumps +# spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 554fc2a17dc1b0ecc10f11a1d9b59787b0385b98b6ab2554a260d6f25258cece Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 10 Jun 2022 16:04:31 +0000 Subject: [PATCH 2/6] - Revert last change. OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=60 --- _multibuild | 9 +++++++++ mumps.changes | 6 ------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/_multibuild b/_multibuild index ebafd49..d478520 100644 --- a/_multibuild +++ b/_multibuild @@ -1,9 +1,18 @@ serial + openmpi1 + openmpi2 + openmpi3 openmpi4 mvapich2 scotch-serial + scotch-openmpi1 + scotch-openmpi2 + scotch-openmpi3 scotch-openmpi4 + gnu-openmpi-hpc + gnu-openmpi2-hpc + gnu-openmpi3-hpc gnu-openmpi4-hpc gnu-mvapich2-hpc gnu-mpich-hpc diff --git a/mumps.changes b/mumps.changes index 77155d2..d1b644c 100644 --- a/mumps.changes +++ b/mumps.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri Jun 10 12:49:55 UTC 2022 - Egbert Eich - -- Dropping openmpi1/2/3 flavors from default as these have been - dropped from oS:Factory. - ------------------------------------------------------------------- Fri Mar 26 20:24:52 UTC 2021 - Egbert Eich From 5fb4ed0e8113bded30ba898ad600dabda802060f5d3be1e40129ddb1f52a0953 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Tue, 6 Sep 2022 10:03:00 +0000 Subject: [PATCH 3/6] Accepting request 1001056 from home:StefanBruens:branches:science - Correct name of library packages to match SONAME. OBS-URL: https://build.opensuse.org/request/show/1001056 OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=61 --- mumps.changes | 5 +++++ mumps.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mumps.changes b/mumps.changes index d1b644c..cf1414d 100644 --- a/mumps.changes +++ b/mumps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Sep 3 22:07:56 UTC 2022 - Stefan Brüns + +- Correct name of library packages to match SONAME. + ------------------------------------------------------------------- Fri Mar 26 20:24:52 UTC 2021 - Egbert Eich diff --git a/mumps.spec b/mumps.spec index c112bf1..ea6b641 100644 --- a/mumps.spec +++ b/mumps.spec @@ -20,7 +20,7 @@ %define pname mumps %define ver 5.3.5 -%define so_ver 5 +%define so_ver 5_3_5 %define openblas_vers 0.3.6 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects From 2de8215e1e5a4d18927c1e5e5d8aa338c3ec58bc6af52e4a4b76b5615b69d4d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Thu, 8 Sep 2022 00:57:41 +0000 Subject: [PATCH 4/6] Accepting request 1001505 from home:StefanBruens:branches:science - Add missing conflicts to old library package. - Cleanup obsolete parts from spec file. OBS-URL: https://build.opensuse.org/request/show/1001505 OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=62 --- mumps.changes | 6 ++++++ mumps.spec | 37 ++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/mumps.changes b/mumps.changes index cf1414d..bf67e67 100644 --- a/mumps.changes +++ b/mumps.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 6 17:23:51 UTC 2022 - Stefan Brüns + +- Add missing conflicts to old library package. +- Cleanup obsolete parts from spec file. + ------------------------------------------------------------------- Sat Sep 3 22:07:56 UTC 2022 - Stefan Brüns diff --git a/mumps.spec b/mumps.spec index ea6b641..bcbdd02 100644 --- a/mumps.spec +++ b/mumps.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package mumps # # Copyright (c) 2022 SUSE LLC # @@ -421,11 +421,6 @@ ExclusiveArch: do_not_build %{?mpi_family:%{bcond_without mpi}}%{!?mpi_family:%{bcond_with mpi}} -# openmpi 1 was called just "openmpi" in Leap 15.x/SLE15 -%if 0%{?suse_version} >= 1550 || "%{mpi_family}" != "openmpi" || "%{mpi_ver}" != "1" -%define mpi_ext %{?mpi_ver} -%endif - %if %{with scotch} %if %{with mpi} %define scotch ptscotch @@ -442,8 +437,8 @@ ExclusiveArch: do_not_build %define my_incdir %_includedir %define my_datadir %_datadir %else -%define my_suffix -%{mpi_family}%{?mpi_ext} -%define my_prefix %{_libdir}/mpi/gcc/%{mpi_family}%{?mpi_ext} +%define my_suffix -%{mpi_family}%{?mpi_ver} +%define my_prefix %{_libdir}/mpi/gcc/%{mpi_family}%{?mpi_ver} %define my_bindir %{my_prefix}/bin %define my_libdir %{my_prefix}/%{_lib}/ %define my_incdir %{my_prefix}/include/ @@ -476,11 +471,11 @@ Source0: http://mumps.enseeiht.fr/MUMPS_%{version}.tar.gz#/%{pname}-%{ver Source1: Makefile.inc %if %{without hpc} BuildRequires: gcc-fortran -%{?with_scotch:BuildRequires: %{scotch}%{?with_mpi:-%{mpi_family}%{?mpi_ext}}-devel} +%{?with_scotch:BuildRequires: %{scotch}%{?with_mpi:-%{mpi_family}%{?mpi_ver}}-devel} %if %{with mpi} -BuildRequires: %{mpi_family}%{?mpi_ext}-devel -BuildRequires: libblacs2-%{mpi_family}%{?mpi_ext}-devel -BuildRequires: scalapack-%{mpi_family}%{?mpi_ext}-devel +BuildRequires: %{mpi_family}%{?mpi_ver}-devel +BuildRequires: libblacs2-%{mpi_family}%{?mpi_ver}-devel +BuildRequires: scalapack-%{mpi_family}%{?mpi_ver}-devel %endif # mpi BuildRequires: blas-devel BuildRequires: lapack-devel @@ -506,12 +501,15 @@ Group: System/Libraries %{?with_mpi:Recommends: %{libname}-compat = %{version}} # Explicitly include this library here: # the solver doesn't have enough information to pick the correct MPI flavor -%{?with_mpi:Requires: libblacs2-%{mpi_family}%{?mpi_ext}} +%{?with_mpi:Requires: libblacs2-%{mpi_family}%{?mpi_ver}} %else %{requires_eq libscalapack2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc} %hpc_requires Requires: lua-lmod >= 7.6.1 %endif +%if %{without hpc} +Conflicts: lib%{pname}%{?scotch:-scotch}5 >= 5.3.5 +%endif %description -n %{libname} MUMPS implements a direct solver for large sparse linear systems, with a @@ -522,7 +520,7 @@ C interfaces, and can interface with ordering tools such as Scotch. %if %{!with mpi} This package contains the sequential library%{?scotch: with Scotch support enabled}. %else -This package contains the parallel library%{?with_mpi: with %{mpi_family}%{?mpi_ver}}%{?scotch: with Scotch support enabled}. +This package contains the parallel library with %{mpi_family}%{?mpi_ver} and %{?scotch: with Scotch support enabled}. %endif %package -n %{libname}-compat @@ -560,7 +558,7 @@ This package provides Documentation for %{package_name}. %if %{!with mpi} This package contains the sequential library%{?scotch: with Scotch support enabled}. %else -This package contains the parallel library%{?with_mpi: with %{mpi_family}%{?mpi_ver}}%{?scotch: with Scotch support enabled}. +This package contains the parallel library with %{mpi_family}%{?mpi_ver} and %{?scotch: with Scotch support enabled}. %endif %package devel @@ -572,14 +570,11 @@ Requires: %{libname} = %version Requires: mumps-devel = %{version} %endif %if %{with mpi} -Requires: %{mpi_family}%{?mpi_ext}-devel -Requires: scalapack-%{mpi_family}%{?mpi_ext}-devel +Requires: %{mpi_family}%{?mpi_ver}-devel +Requires: scalapack-%{mpi_family}%{?mpi_ver}-devel %if %{with scotch} Requires: mumps-scotch-devel = %{version} -Requires: ptscotch-%{mpi_family}%{?mpi_ext}-devel - %endif - %if "%{mpi_family}%{?mpi_ext}" == "openmpi1" -Provides: %{pname}%{?scotch:-%{scotch}}-openmpi-devel +Requires: ptscotch-%{mpi_family}%{?mpi_ver}-devel %endif %else # mpi Requires: blas-devel From 23b9d5474d856c20c5e28b3837b12b07a3d164e571040cbbad14f02c53fc5369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Thu, 8 Sep 2022 16:09:40 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=63 --- mumps.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mumps.spec b/mumps.spec index bcbdd02..07b8b19 100644 --- a/mumps.spec +++ b/mumps.spec @@ -508,7 +508,7 @@ Group: System/Libraries Requires: lua-lmod >= 7.6.1 %endif %if %{without hpc} -Conflicts: lib%{pname}%{?scotch:-scotch}5 >= 5.3.5 +Conflicts: lib%{pname}%{?scotch:-scotch}5%{?my_suffix} >= 5.3.5 %endif %description -n %{libname} From 8d7a54d6052a4bbcb1b739b94c70db9c7a10c40c6576a07a58db2bc133990b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Sun, 11 Sep 2022 13:51:54 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=64 --- mumps.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mumps.spec b/mumps.spec index 07b8b19..4226ea9 100644 --- a/mumps.spec +++ b/mumps.spec @@ -508,7 +508,7 @@ Group: System/Libraries Requires: lua-lmod >= 7.6.1 %endif %if %{without hpc} -Conflicts: lib%{pname}%{?scotch:-scotch}5%{?my_suffix} >= 5.3.5 +Conflicts: lib%{pname}%{?scotch:-%{scotch}}5%{?my_suffix} >= 5.3.5 %endif %description -n %{libname}