Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openmpi4 for openSUSE:Factory
checked in at 2025-04-03 16:45:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openmpi4 (Old)
and /work/SRC/openSUSE:Factory/.openmpi4.new.1907 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openmpi4"
Thu Apr 3 16:45:51 2025 rev:20 rq:1265559 version:4.1.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/openmpi4/openmpi4.changes 2025-02-26
17:14:00.643877942 +0100
+++ /work/SRC/openSUSE:Factory/.openmpi4.new.1907/openmpi4.changes
2025-04-03 16:45:54.324835442 +0200
@@ -1,0 +2,10 @@
+Sat Mar 29 14:42:02 UTC 2025 - Nicolas Morey <nicolas.mo...@suse.com>
+
+- Remove support for gnu-hpc build flavours.
+
+-------------------------------------------------------------------
+Mon Mar 24 12:52:28 UTC 2025 - Nicolas Morey <nicolas.mo...@suse.com>
+
+- Disable gnu-hpc build flavours (bsc#1239982)
+
+-------------------------------------------------------------------
Old:
----
macros.hpc-openmpi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openmpi4.spec ++++++
--- /var/tmp/diff_new_pack.crKkXx/_old 2025-04-03 16:45:57.008948509 +0200
+++ /var/tmp/diff_new_pack.crKkXx/_new 2025-04-03 16:45:57.012948678 +0200
@@ -1,5 +1,5 @@
#
-# spec file
+# spec file for package openmpi4
#
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
@@ -37,70 +37,29 @@
%global flavor @BUILD_FLAVOR@%{nil}
# Static libraries are disabled by default
-# for non HPC builds
# To enable them, simply uncomment:
# % define build_static_devel 1
-%global pname openmpi
-%define _vers 4_1_8
-%define m_f_ver 4
%bcond_with ringdisabled
%if "%flavor" == ""
ExclusiveArch: do_not_build
- %{bcond_with hpc}
- %define package_name %pname%{m_f_ver}
-%else
- # Trickery for OBS Staging. If _with_ringdisabled is set
- # we only want to build the flavors required by other rings packages.
- # Do not build any other ones
- %if %{with ringdisabled}
- %if "%flavor" != "standard"
-ExclusiveArch: do_not_build
- %endif
- %endif
+%endif
- %if "%flavor" == "standard" || "%flavor" == "testsuite"
- %define package_name %{pname}%{m_f_ver}
- %bcond_with hpc
- %if "%flavor" == "testsuite"
- %define testsuite 1
- %endif
- %else
- %bcond_without hpc
-# Needs to be defined here to avoid hen/egg problem with test packages.
- %define package_name %{pname}_%{_vers}-%{compiler_family}%{?c_f_ver}-hpc
- %define build_static_devel 1
- %endif
-%endif
-
-%if "%flavor" == "gnu-hpc"
-%define compiler_family gnu
-%undefine c_f_ver
-%endif
-
-%if "%flavor" == "gnu7-hpc"
-%define compiler_family gnu
-%define c_f_ver 7
-%endif
-
-%if "%flavor" == "gnu-hpc-testsuite"
-%define compiler_family gnu
-%undefine c_f_ver
-%define testsuite 1
+# Trickery for OBS Staging. If _with_ringdisabled is set
+# we only want to build the flavors required by other rings packages.
+# Do not build any other ones
+ %if %{with ringdisabled} && "%flavor" != "standard"
+ExclusiveArch: do_not_build
%endif
-%if "%flavor" == "gnu7-hpc-testsuite"
-%define compiler_family gnu
-%define c_f_ver 7
+%if "%flavor" == "testsuite"
%define testsuite 1
%endif
-%if 0%{?suse_version} >= 1320
%ifarch aarch64 %power64 x86_64 s390x
%define with_ucx 1
%endif
-%endif
# Detect whether we are the default openMPI implemantation or not
%if "%{flavor}" == "standard" && (%{suse_version} > 1500 || 0%{?sle_version} >
150300) && (%{suse_version} < 1600)
@@ -109,20 +68,8 @@
%define default_openmpi 0
%endif
-%if %{with hpc}
-%{!?compiler_family:%global compiler_family gnu}
-%{hpc_init -M -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} -m openmpi
%{?mpi_f_ver:-V %{mpi_f_ver}}}
-
-%global hpc_openmpi_dep_version %(VER=%m_f_ver; echo -n ${VER})
-%global hpc_openmpi_dir openmpi%{hpc_openmpi_dep_version}
-%global hpc_openmpi_pack_version %{hpc_openmpi_dep_version}
-%{bcond_without pmix}
-%{bcond_without hwloc}
-ExcludeArch: i586 %arm s390
-%else
%{bcond_with pmix}
%{bcond_with hwloc}
-%endif
%define git_ver .0.ea8f4d030890
@@ -132,16 +79,15 @@
#
#############################################################################
-Name: %{package_name}%{?testsuite:-testsuite}
+Name: openmpi4%{?testsuite:-testsuite}
Version: 4.1.8
Release: 0
-Summary: An implementation of MPI/SHMEM (Version %{m_f_ver})
+Summary: An implementation of MPI/SHMEM (Version 4)
License: BSD-3-Clause
Group: Development/Libraries/Parallel
URL: https://www.open-mpi.org/
Source0: openmpi-%{version}%{git_ver}.tar.bz2
Source2: openmpi4-rpmlintrc
-Source3: macros.hpc-openmpi
Source4: mpivars.sh
Source5: mpivars.csh
Patch1: orted-mpir-add-version-to-shared-library.patch
@@ -166,7 +112,7 @@
BuildRequires: net-tools
%if 0%{?testsuite}
BuildArch: noarch
-BuildRequires: %{package_name} = %{version}
+BuildRequires: openmpi4 = %{version}
%endif
%if 0%{?with_ucx}
BuildRequires: libucm-devel
@@ -180,23 +126,13 @@
%if %{with pmix}
BuildRequires: pmix-devel
%endif
-%if %{without hpc}
BuildRequires: Modules
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
BuildRequires: mpi-selector
Requires: mpi-selector
-Requires(preun):mpi-selector
-Requires: %{package_name}-libs = %{version}
-%else
-BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
-BuildRequires: lua-lmod
-BuildRequires: suse-hpc
-%if 0%{!?testsuite:1}
-Requires: lib%{package_name} = %{version}
-%endif
-%hpc_requires
-%endif
+Requires(preun): mpi-selector
+Requires: %{name}-libs = %{version}
%ifarch x86_64
BuildRequires: libnuma-devel
@@ -205,7 +141,7 @@
%endif
Requires: openmpi-runtime-config
-Recommends: openmpi%{m_f_ver}-config
+Recommends: %{name}-config
%if 0%{?default_openmpi}
Provides: openmpi = %{version}
%endif
@@ -213,26 +149,14 @@
# Force ssh to make sure the install works out of the box
Requires: openssh
-%if %{without hpc}
-%define mpi_prefix %{_libdir}/mpi/gcc/openmpi%{m_f_ver}
+%define mpi_prefix %{_libdir}/mpi/gcc/%{name}
%define mpi_bindir %{mpi_prefix}/bin
%define mpi_libdir %{mpi_prefix}/%{_lib}
%define mpi_datadir %{mpi_prefix}/share
-%define mpi_helpdir %{mpi_datadir}/%{pname}%{m_f_ver}
+%define mpi_helpdir %{mpi_datadir}/%{name}
%define mpi_includedir %{mpi_prefix}/include
%define mpi_mandir %{mpi_prefix}/share/man
-%else
-%define mpi_prefix %hpc_prefix
-
-%define mpi_bindir %hpc_bindir
-%define mpi_libdir %hpc_libdir
-%define mpi_datadir %hpc_datadir
-%define mpi_helpdir %{mpi_datadir}/openmpi
-%define mpi_includedir %hpc_includedir
-%define mpi_mandir %hpc_mandir
-
-%endif
%description
%if 0%{?testsuite}
@@ -252,20 +176,19 @@
This package provides general tools (mpirun, mpiexec, etc.) and the
Module Component Architecture (MCA) base and plugins necessary for
-running Open MPI/OpenSHMEM version %{m_f_ver} jobs.
+running Open MPI/OpenSHMEM version %{version} jobs.
%endif
%if 0%{!?testsuite:1}
-%package %{!?with_hpc:libs}%{?with_hpc:-n lib%{name}}
-Summary: OpenMPI runtime libraries for OpenMPI %{?with_hpc:HPC} version
%{version}
+%package libs
+Summary: OpenMPI runtime libraries for OpenMPI version %{version}
Group: System/Libraries
Requires: %{name} = %{version}
%if 0%{?default_openmpi}
Provides: openmpi-libs = %{version}
%endif
-%{?with_hpc:%hpc_requires}
-%description %{!?with_hpc:libs}%{?with_hpc:-n lib%{name}}
+%description libs
OpenMPI is an implementation of the Message Passing Interface, a
standardized API typically used for parallel and/or distributed
computing. OpenMPI is the merged result of four prior implementations
@@ -277,22 +200,18 @@
abstraction layer providing inter-process communication using
one-sided communication techniques.
-This package provides the Open MPI/OpenSHMEM version %{m_f_ver}
+This package provides the Open MPI/OpenSHMEM version %{version}
shared libraries.
%package devel
-Summary: SDK for openMPI %{?with_hpc:HPC} version %{version}
+Summary: SDK for openMPI version %{version}
Group: Development/Libraries/Parallel
Requires: libibumad-devel
Requires: libibverbs-devel
-%if %{without hpc}
Requires: libstdc++-devel
%if 0%{?default_openmpi}
Provides: openmpi-devel = %{version}
%endif
-%else
-%hpc_requires_devel
-%endif
Requires: %{name} = %{version}
%description devel
@@ -308,11 +227,11 @@
one-sided communication techniques.
This package provides the development files for Open MPI/OpenSHMEM
-version %{m_f_ver}, such as wrapper compilers and header files for
+version %{version}, such as wrapper compilers and header files for
MPI/OpenSHMEM development.
%package docs
-Summary: Documentation for Open MPI/SHMEM %{?with_hpc:HPC} version
%{version}
+Summary: Documentation for Open MPI/SHMEM version %{version}
Group: Documentation/Man
Requires: %{name} = %{version}
@@ -335,11 +254,11 @@
Group: Development/Libraries/Parallel
Requires: %{name}-devel = %{version}
# Make sure no two openmpi macro file can be installed at once
-Provides: %{pname}-macros-provider = %{version}
-Conflicts: otherproviders(%{pname}-macros-provider)
+Provides: openmpi-macros-provider = %{version}
+Conflicts: otherproviders(openmpi-macros-provider)
# Conflict (without providing) with the older openmpi-hpc-macros-devel flag
# to avoid issue with older packages
-Conflicts: otherproviders(%{pname}-hpc-macros-devel)
+Conflicts: otherproviders(openmpi-hpc-macros-devel)
%if 0%{?default_openmpi}
Provides: openmpi-macros-devel = %{version}
@@ -350,7 +269,7 @@
%if 0%{?build_static_devel}
%package devel-static
-Summary: Static libraries for openMPI %{?with_hpc:HPC} version
%{version}
+Summary: Static libraries for openMPI version %{version}
Group: Development/Libraries/Parallel
Requires: %{name}-devel = %{version}
%if 0%{?default_openmpi}
@@ -368,9 +287,8 @@
the dynamic library and headers.
%endif
-%if %{without hpc}
-%package -n %{pname}%{m_f_ver}-config
-Summary: Runtime configuration files for openMPI %{?with_hpc:HPC}
version %{version}
+%package config
+Summary: Runtime configuration files for openMPI version %{version}
Group: Development/Libraries/Parallel
Provides: openmpi-runtime-config = %{version}
Conflicts: otherproviders(openmpi-runtime-config)
@@ -380,7 +298,7 @@
Conflicts: otherproviders(pmix-runtime-config)
%endif
-%description -n %{pname}%{m_f_ver}-config
+%description config
OpenMPI is an implementation of the Message Passing Interface, a
standardized API typically used for parallel and/or distributed
computing. OpenMPI is the merged result of four prior implementations
@@ -388,22 +306,9 @@
such as latency or throughput.
This RPM contains the configuration files for OpenMPI runtime (Version 3).
-%endif
-%if %{with hpc}
-%{hpc_master_package -L -a}
-%{hpc_master_package -l}
-%{hpc_master_package devel}
-%{hpc_master_package docs}
-%{hpc_master_package macros-devel}
-%{hpc_master_package -a devel-static}
-%endif # ?with_hpc
%endif # !testsuite
-%if "%(echo %version | tr '.' '_')" != "%_vers"
-%{error: Fix _vers variable to match package version!}
-%endif
-
#############################################################################
#
# Prepatory Section
@@ -411,19 +316,11 @@
#############################################################################
%prep
echo FLAVOR %{flavor}
-%if %{with hpc}
-echo with HPC
-%endif
-%if %{without hpc}
-echo without HPC
-%endif
%autosetup -p0 -n openmpi-%{version}%{git_ver}
-%if %{without hpc}
cat > %{_sourcedir}/baselibs.conf <<EOF
openmpi%{m_f_ver}-libs
EOF
-%endif
# Live patch the VERSION file
sed -i -e 's/^greek=.*$/greek=%{git_ver}/' -e
's/^repo_rev=.*$/repo_rev=%{version}%{git_ver}/' \
@@ -441,12 +338,7 @@
export HOSTNAME=OBS
# OBS sets SOURCE_DATE_EPOCH
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
-%{?with_hpc:%hpc_debug}
./autogen.pl --force
-%if %{with hpc}
-%{hpc_setup}
-%{hpc_configure} \
-%else
%{configure} \
--prefix="%{mpi_prefix}" \
--exec-prefix="%{mpi_prefix}" \
@@ -455,7 +347,6 @@
--includedir="%{mpi_includedir}" \
--libdir="%{mpi_libdir}" \
--mandir="%{mpi_mandir}" \
-%endif
%{?build_static_devel:--enable-static} \
%{!?build_static_devel:--disable-static} \
--enable-builtin-atomics \
@@ -505,7 +396,6 @@
#############################################################################
%install
-%{?with_hpc:%{hpc_setup_compiler}}
make install DESTDIR="%buildroot"
# sanitize .la files
@@ -538,7 +428,6 @@
%fdupes %{buildroot}%{mpi_datadir}
%fdupes %{buildroot}%{mpi_libdir}/pkgconfig
-%if %{without hpc}
# make and install mpivars files
sed -e 's,prefix,%{mpi_prefix},g' -e 's,libdir,%{mpi_libdir},g' %{SOURCE4} \
> %{buildroot}%{mpi_bindir}/mpivars.sh
@@ -575,56 +464,7 @@
%openmpi_devel_requires Requires: %{name}-devel
EOF
-%else
-%hpc_write_modules_files
-#%%Module1.0#####################################################################
-
-proc ModulesHelp { } {
-
-puts stderr " "
-puts stderr "This module loads the %{pname} library built with the
%{compiler_family} toolchain."
-puts stderr "\nVersion %{version}\n"
-
-}
-module-whatis "Name: %{pname} built with %{compiler_family} toolchain"
-module-whatis "Version: %{version}"
-module-whatis "Category: runtime library"
-module-whatis "Description: %{SUMMARY:0}"
-module-whatis "URL: %{url}"
-
-set version %{version}
-
-setenv MPI_DIR %{hpc_mpi_install_path}
-prepend-path PATH %{hpc_bindir}
-prepend-path MANPATH %{hpc_mandir}
-prepend-path LD_LIBRARY_PATH %{hpc_libdir}
-prepend-path MODULEPATH %{hpc_modulepath}
-%{hpc_modulefile_add_pkgconfig_path}
-
-family "MPI"
-EOF
-cat <<EOF > %{buildroot}/%{mpi_bindir}/mpivars.sh
-%hpc_setup_compiler
-module load %{hpc_mpi_family}%{?pack_suff}/%{version}
-EOF
-sed -e "s/export/setenv/" -e "s/=/ /" \
- %{buildroot}/%{mpi_bindir}/mpivars.sh > \
- %{buildroot}/%{mpi_bindir}/mpivars.csh
-mkdir -p %{buildroot}%{_rpmmacrodir}
-mkdir -p %{buildroot}%{_rpmmacrodir}
-cp %{S:3} %{buildroot}%{_rpmmacrodir}
-# Drop the files that should go into %{pname}-config as we only package them
-# in the non HPC build
-rm -f %{buildroot}%{_sysconfdir}/openmpi-default-hostfile
-rm -f %{buildroot}%{_sysconfdir}/openmpi-mca-params.conf
-rm -f %{buildroot}%{_sysconfdir}/openmpi-totalview.tcl
-%if %{without pmix}
-rm -f %{buildroot}%{_sysconfdir}/pmix-mca-params.conf
-%endif
-%endif
-
-%if %{without hpc}
%post
# Always register. We might be already registered in the case of an udate
# but mpi-selector handles it fine
@@ -645,14 +485,6 @@
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
-%else #!?with_hpc
-# make it default
-%post -n lib%{name} -p /sbin/ldconfig
-%postun -n lib%{name} -p /sbin/ldconfig
-
-%postun
-%hpc_module_delete_if_default
-%endif #!?with_hpc
%files
%defattr(-, root, root)
@@ -665,17 +497,10 @@
%dir %{mpi_mandir}
%{mpi_bindir}/mpivars.csh
%{mpi_bindir}/mpivars.sh
-
-%if %{without hpc}
%dir %{_libdir}/mpi
%dir %{_libdir}/mpi/gcc
%dir %{_datadir}/modules/gnu-openmpi
%{_datadir}/modules/gnu-openmpi/%{version}
-%else # with hpc
-%hpc_mpi_dirs
-%hpc_modules_files
-%endif # with hpc
-#
%{mpi_bindir}/mpirun
%{mpi_bindir}/ompi-clean
%{mpi_bindir}/ompi-server
@@ -691,11 +516,8 @@
%{mpi_bindir}/oshrun
%{mpi_bindir}/shmemrun
%endif
-
-%if %{without hpc}
%{mpi_bindir}/aggregate_profile.pl
%{mpi_bindir}/profile2mat.pl
-%endif
%dir %{mpi_datadir}/openmpi
%dir %{mpi_datadir}/openmpi/amca-param-sets
@@ -709,7 +531,7 @@
%{mpi_datadir}/pmix/help-*.txt
%endif
-%files %{!?with_hpc:libs}%{?with_hpc:-n lib%{name}}
+%files libs
%defattr(-,root,root)
%dir %mpi_prefix/
%dir %mpi_libdir/
@@ -728,10 +550,8 @@
%{mpi_libdir}/*.so
%{mpi_libdir}/pkgconfig/*.pc
%{mpi_libdir}/mpi.mod
-%if 0%{?suse_version} >= 1320
%{mpi_libdir}/mpi_f08*.mod
%{mpi_libdir}/pmpi_f08*.mod
-%endif
%{mpi_bindir}/mpiCC
%{mpi_bindir}/mpic++
%{mpi_bindir}/mpicc
@@ -765,11 +585,7 @@
%files macros-devel
%defattr(-,root,root,-)
-%if %{with hpc}
-%{_rpmmacrodir}/macros.hpc-openmpi
-%else
%{_rpmmacrodir}/macros.openmpi
-%endif
%if 0%{?build_static_devel}
%files devel-static
@@ -780,15 +596,13 @@
%{mpi_libdir}/openmpi/*.a
%endif
-%if %{without hpc}
-%files -n %{pname}%{m_f_ver}-config
+%files config
%config %{_sysconfdir}/openmpi-default-hostfile
%config %{_sysconfdir}/openmpi-mca-params.conf
%if %{without pmix}
%config %{_sysconfdir}/pmix-mca-params.conf
%endif
%{_sysconfdir}/openmpi-totalview.tcl
-%endif
%endif # !?testsuite
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.crKkXx/_old 2025-04-03 16:45:57.064950868 +0200
+++ /var/tmp/diff_new_pack.crKkXx/_new 2025-04-03 16:45:57.072951206 +0200
@@ -1,7 +1,5 @@
<multibuild>
<package>standard</package>
<package>testsuite</package>
- <package>gnu-hpc</package>
- <package>gnu-hpc-testsuite</package>
</multibuild>
