Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package hdf5 for openSUSE:Factory checked in
at 2025-04-03 16:46:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hdf5 (Old)
and /work/SRC/openSUSE:Factory/.hdf5.new.1907 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hdf5"
Thu Apr 3 16:46:55 2025 rev:89 rq:1266212 version:1.14.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/hdf5/hdf5.changes 2025-03-24
13:28:09.037544886 +0100
+++ /work/SRC/openSUSE:Factory/.hdf5.new.1907/hdf5.changes 2025-04-03
16:47:33.969032590 +0200
@@ -1,0 +2,6 @@
+Mon Mar 24 13:12:38 UTC 2025 - Nicolas Morey <nicolas.mo...@suse.com>
+
+- Disable and remove support for gnu-hpc build flavours (bsc#1239982)
+- openmpi5 is not available on 32b systems
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hdf5.spec ++++++
--- /var/tmp/diff_new_pack.n6kHtc/_old 2025-04-03 16:47:34.793067294 +0200
+++ /var/tmp/diff_new_pack.n6kHtc/_new 2025-04-03 16:47:34.797067464 +0200
@@ -21,10 +21,6 @@
%bcond_with sz2
%define sonum 310
-%define short_ver 1.14
-%define vers %{short_ver}.6
-%define _vers %( echo %{vers} | tr '.' '_' )
-%define src_ver %{version}
%define pname hdf5
%bcond_with static
@@ -38,255 +34,46 @@
%endif
%if "%{flavor}" == "serial"
-%bcond_with hpc
%endif
%if "%{flavor}" == "openmpi4"
-%global mpi_flavor openmpi
-%define mpi_vers 4
-%bcond_with hpc
+%global mpi_flavor %{flavor}
%endif
%if "%{flavor}" == "openmpi5"
-%global mpi_flavor openmpi
-%define mpi_vers 5
-%bcond_with hpc
+%global mpi_flavor %{flavor}
+ExcludeArch: %{ix86} %{arm}
%endif
%if "%{flavor}" == "mvapich2"
%global mpi_flavor %{flavor}
-%bcond_with hpc
-%endif
-
-%if "%{flavor}" == "gnu-hpc"
-%bcond_without hpc
-%global compiler_family gnu
-%undefine c_f_ver
-%endif
-
-%if "%{flavor}" == "gnu-openmpi4-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%undefine c_f_ver
-%global mpi_flavor openmpi
-%define mpi_vers 4
-%endif
-
-%if "%{flavor}" == "gnu-openmpi5-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%undefine c_f_ver
-%global mpi_flavor openmpi
-%define mpi_vers 5
-%endif
-
-%if "%{flavor}" == "gnu-mvapich2-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%undefine c_f_ver
-%global mpi_flavor mvapich2
-%endif
-
-%if "%{flavor}" == "gnu-mpich-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%undefine c_f_ver
-%global mpi_flavor mpich
-%endif
-
-%if "%{flavor}" == "gnu7-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 7
-%undefine mpi_flavor
-%endif
-
-%if "%{flavor}" == "gnu7-openmpi4-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 7
-%global mpi_flavor openmpi
-%define mpi_vers 4
-%endif
-
-%if "%{flavor}" == "gnu7-openmpi5-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 7
-%global mpi_flavor openmpi
-%define mpi_vers 5
-%endif
-
-%if "%{flavor}" == "gnu7-mvapich2-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 7
-%global mpi_flavor mvapich2
-%endif
-
-%if "%{flavor}" == "gnu7-mpich-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 7
-%global mpi_flavor mpich
-%endif
-
-%if "%{flavor}" == "gnu8-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 8
-%undefine mpi_flavor
-%endif
-
-%if "%{flavor}" == "gnu8-openmpi4-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 8
-%global mpi_flavor openmpi
-%define mpi_vers 4
-%endif
-
-%if "%{flavor}" == "gnu8-openmpi5-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 8
-%global mpi_flavor openmpi
-%define mpi_vers 5
-%endif
-
-%if "%{flavor}" == "gnu8-mvapich2-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 8
-%global mpi_flavor mvapich2
-%endif
-
-%if "%{flavor}" == "gnu8-mpich-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 8
-%global mpi_flavor mpich
-%endif
-
-%if "%{flavor}" == "gnu9-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 9
-%undefine mpi_flavor
-%endif
-
-%if "%{flavor}" == "gnu9-openmpi4-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 9
-%global mpi_flavor openmpi
-%define mpi_vers 4
-%endif
-
-%if "%{flavor}" == "gnu9-openmpi5-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 9
-%global mpi_flavor openmpi
-%define mpi_vers 5
-%endif
-
-%if "%{flavor}" == "gnu9-mvapich2-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 9
-%global mpi_flavor mvapich2
-%endif
-
-%if "%{flavor}" == "gnu9-mpich-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 9
-%global mpi_flavor mpich
-%endif
-
-%if "%{flavor}" == "gnu10-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 10
-%undefine mpi_flavor
-%endif
-
-%if "%{flavor}" == "gnu10-openmpi4-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 10
-%global mpi_flavor openmpi
-%define mpi_vers 4
-%endif
-
-%if "%{flavor}" == "gnu10-openmpi5-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 10
-%global mpi_flavor openmpi
-%define mpi_vers 5
-%endif
-
-%if "%{flavor}" == "gnu10-mvapich2-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 10
-%global mpi_flavor mvapich2
-%endif
-
-%if "%{flavor}" == "gnu10-mpich-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 10
-%global mpi_flavor mpich
%endif
%{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}}
-%{?with_hpc:%{!?compiler_family:%global compiler_family gnu}}
%{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}}
-# For compatibility package names
-%define mpi_ext %{?mpi_vers}
-
-%if %{with hpc}
-%{hpc_init -c %compiler_family %{?with_mpi:-m %mpi_flavor} %{?c_f_ver:-v
%{c_f_ver}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}}
-%{?with_mpi:%global hpc_module_pname p%{pname}}
- %define my_prefix %hpc_prefix
- %define my_bindir %hpc_bindir
- %ifarch x86_64
- %define my_libdir %hpc_prefix/lib64
- %else
- %define my_libdir %hpc_libdir
- %endif
- %define my_incdir %hpc_includedir
- %define package_name %{hpc_package_name %_vers}
- %define libname(l:s:) lib%{pname}%{-l*}%{hpc_package_name_tail %{?_vers}}
- %define vname %{pname}_%{_vers}-hpc
-%else
- %if %{without mpi}
+%if %{without mpi}
%define my_prefix %_prefix
%define my_bindir %_bindir
%define my_libdir %_libdir
%define my_incdir %_includedir
- %else
- %define my_prefix %{_libdir}/mpi/gcc/%{mpi_flavor}%{?mpi_ext}
- %define my_suffix -%{mpi_flavor}%{?mpi_ext}
+%else
+ %define my_prefix %{_libdir}/mpi/gcc/%{mpi_flavor}
+ %define my_suffix -%{mpi_flavor}
%define my_bindir %{my_prefix}/bin
%define my_libdir %{my_prefix}/%{_lib}
%define my_incdir %{my_prefix}/include
- %endif
- %if 0%{!?package_name:1}
+%endif
+%if 0%{!?package_name:1}
%define package_name %pname%{?my_suffix}
- %endif
- %define libname(l:s:) lib%{pname}%{!-l:%{-s:-}}%{-l*}%{-s*}%{?my_suffix}
- %define vname %{pname}
%endif
+%define libname(l:s:) lib%{pname}%{!-l:%{-s:-}}%{-l*}%{-s*}%{?my_suffix}
+%define vname %{pname}
%define __builder ninja
Name: %{package_name}
-Version: %vers
+Version: 1.14.6
Release: 0
Summary: Command-line programs for the HDF5 scientific data format
License: BSD-3-Clause
@@ -313,36 +100,17 @@
BuildRequires: sz2-devel
%endif
BuildRequires: zlib-devel
-%if %{without hpc}
- %if %{with mpi}
-BuildRequires: %{mpi_flavor}%{?mpi_ext}-devel
- %else
+%if %{with mpi}
+BuildRequires: %{mpi_flavor}-devel
+%else
Requires: lib%{pname}_cpp%{sonum} = %{version}
Requires: lib%{pname}_hl_cpp%{sonum} = %{version}
- %endif
+%endif
Requires: lib%{pname}-%{sonum} = %{version}
Requires: lib%{pname}_fortran%{sonum} = %{version}
Requires: lib%{pname}_hl%{sonum} = %{version}
Requires: lib%{pname}_hl_fortran%{sonum} = %{version}
Requires: lib%{pname}_tools%{sonum} = %{version}
-%else # hpc
-%hpc_requires
-Requires: %{libname -l _fortran}
-%if %{without mpi}
-Requires: %{libname -l _cpp}
-Requires: %{libname -l _hl_cpp}
-%endif
-Requires: %{libname -l _hl_fortran}
-Requires: %{libname -l _hl}
-Requires: %{libname -l _tools}
-Requires: %{libname}
-BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
-BuildRequires: lua-lmod
-BuildRequires: suse-hpc >= 0.2
- %if %{with mpi}
-BuildRequires:
%{mpi_flavor}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel
- %endif
-%endif # ?hpc
%description
HDF5 is a data model, library, and file format for storing and
@@ -351,15 +119,12 @@
This package contains the %{flavor} version utility functions for working
with HDF5 files.
-%{?with_hpc:%{hpc_master_package}}
-
%package -n %{libname -s %{sonum}}
Summary: Shared libraries for the HDF5 scientific data format
# To avoid unresolvable errors due to multiple providers of the library
Group: System/Libraries
Provides: %{libname} = %{version}
Obsoletes: %{libname} < %{version}
-%{?with_hpc:Requires: %{name}-module = %version}
%description -n %{libname -s %{sonum}}
HDF5 is a data model, library, and file format for storing and
@@ -367,15 +132,12 @@
This package contains the %{flavor} version of the HDF5 runtime libraries.
-%{?with_hpc:%{hpc_master_package -l -n lib%{pname}%{hpc_package_name_tail}}}
-
%package -n %{libname -l _hl -s %{sonum}}
Summary: High-level shared libraries for the HDF5 scientific data format
# To avoid unresolvable errors due to multiple providers of the library
Group: System/Libraries
Provides: %{libname -l _hl} = %{version}
Obsoletes: %{libname -l _hl} < %{version}
-%{?with_hpc:Requires: %{name}-module = %version}
%description -n %{libname -l _hl -s %{sonum}}
HDF5 is a data model, library, and file format for storing and
@@ -384,15 +146,12 @@
This package contains the %{flavor} version of the high-level HDF5
runtime libraries.
-%{?with_hpc:%{hpc_master_package -l -n lib%{pname}_hl%{hpc_package_name_tail}
-N %{pname}_hl}}
-
%package -n %{libname -l _cpp -s %{sonum}}
Summary: Shared libraries for the HDF5 scientific data format
# To avoid unresolvable errors due to multiple providers of the library
Group: System/Libraries
Provides: %{libname -l _cpp} = %{version}
Obsoletes: %{libname -l _cpp} < %{version}
-%{?with_hpc:Requires: %{name}-module = %version}
%description -n %{libname -l _cpp -s %{sonum}}
HDF5 is a data model, library, and file format for storing and
@@ -400,15 +159,12 @@
This package contains the HDF5 runtime libraries.
-%{?with_hpc:%{hpc_master_package -l -n lib%{pname}_cpp%{hpc_package_name_tail}
-N %{pname}_cpp}}
-
%package -n %{libname -l _hl_cpp -s %{sonum}}
Summary: High-level shared libraries for the HDF5 scientific data format
# To avoid unresolvable errors due to multiple providers of the library
Group: System/Libraries
Provides: %{libname -l _hl_cpp} = %{version}
Obsoletes: %{libname -l _hl_cpp} < %{version}
-%{?with_hpc:Requires: %{name}-module = %version}
%description -n %{libname -l _hl_cpp -s %{sonum}}
HDF5 is a data model, library, and file format for storing and
@@ -416,15 +172,12 @@
This package contains the the high-level HDF5 runtime libraries.
-%{?with_hpc:%{hpc_master_package -l -n
lib%{pname}_hl_cpp%{hpc_package_name_tail} -N %{pname}_hl_cpp}}
-
%package -n %{libname -l _fortran -s %{sonum}}
Summary: Shared libraries for the HDF5 scientific data format
# To avoid unresolvable errors due to multiple providers of the library
Group: System/Libraries
Provides: %{libname -l _fortran} = %{version}
Obsoletes: %{libname -l _fortran} < %{version}
-%{?with_hpc:Requires: %{name}-module = %version}
%description -n %{libname -l _fortran -s %{sonum}}
HDF5 is a data model, library, and file format for storing and
@@ -432,15 +185,12 @@
This package contains the %{flavor} version of the HDF5 runtime libraries.
-%{?with_hpc:%{hpc_master_package -l -n
lib%{pname}_fortran%{hpc_package_name_tail} -N %{pname}_fortran}}
-
%package -n %{libname -l _hl_fortran -s %{sonum}}
Summary: High-level shared libraries for the HDF5 scientific data format
# To avoid unresolvable errors due to multiple providers of the library
Group: System/Libraries
Provides: %{libname -l _hl_fortran} = %{version}
Obsoletes: %{libname -l _hl_fortran} < %{version}
-%{?with_hpc:Requires: %{name}-module = %version}
%description -n %{libname -l _hl_fortran -s %{sonum}}
HDF5 is a data model, library, and file format for storing and
@@ -449,15 +199,12 @@
This package contains the %{flavor} version of the high-level HDF5
runtime libraries.
-%{?with_hpc:%{hpc_master_package -l -n
lib%{pname}_hl_fortran%{hpc_package_name_tail} -N %{pname}_hl_fortran}}
-
%package -n %{libname -l _tools -s %{sonum}}
Summary: Shared libraries for the HDF5 scientific data format
# To avoid unresolvable errors due to multiple providers of the library
Group: System/Libraries
Provides: %{libname -l _tools} = %{version}
Obsoletes: %{libname -l _tools} < %{version}
-%{?with_hpc:Requires: %{name}-module = %version}
%description -n %{libname -l _tools -s %{sonum}}
HDF5 is a data model, library, and file format for storing and
@@ -465,8 +212,6 @@
This package contains the HDF5 runtime libraries.
-%{?with_hpc:%{hpc_master_package -l -n
lib%{pname}_tools%{hpc_package_name_tail} -N %{pname}_tools}}
-
%package -n %{pname}-devel-data
Summary: Development data files for %{name}
Group: Development/Libraries/Other
@@ -485,7 +230,7 @@
Requires: %{libname -l _cpp -s %{sonum}} = %{version}
Requires: %{libname -l _hl_cpp -s %{sonum}} = %{version}
Requires: %{name} = %{version}
-%{!?with_hpc:Requires: %{pname}-devel-data = %{version}}
+Requires: %{pname}-devel-data = %{version}
Requires: zlib-devel
%if 0%{?use_sz2}
Requires: libsz2-devel
@@ -496,7 +241,6 @@
Requires: %{libname -l _hl -s %{sonum}} = %{version}
Requires: %{libname -l _hl_fortran -s %{sonum}} = %{version}
Requires: %{libname -l _tools -s %{sonum}} = %{version}
-%{?with_hpc:%hpc_requires_devel}
%description devel
HDF5 is a data model, library, and file format for storing and
@@ -505,8 +249,6 @@
This package contains all files needed to create projects that use
the %{flavor} version of HDF5.
-%{?with_hpc:%{hpc_master_package devel}}
-
%package devel-static
Summary: Static development files for %{name}
Group: Development/Libraries/Parallel
@@ -529,25 +271,7 @@
This package provides examples of HDF5 library use.
-%{?!with_mpi:%{?with_hpc:%{hpc_master_package -n %{pname}-hpc-examples -M
%{vname}-examples}}}
-
-%if %{with hpc}
-%package module
-Summary: Module files for %{name}
-Group: Development/Libraries/Parallel
-Provides: %{name}-module = %version
-Requires: lua-lmod
-
-%description module
-HDF5 is a data model, library, and file format for storing and
-managing data. It supports an unlimited variety of datatypes.
-
-This package contains the environment module needed for the HDF5
-library packages.
-%endif
-
%prep
-%{?with_hpc: %hpc_debug}
%autosetup -N -n %{pname}-%{version}
%patch -P 0 -p1
%patch -P 2 -p0 -b .abort_unknown_host_config
@@ -556,7 +280,6 @@
%endif
%patch -P 5 -p1
-%if %{without hpc}
# baselibs looks different for different flavors - generate it on the fly
cat > %{_sourcedir}/baselibs.conf << EOF
libhdf5-%{sonum}%{?my_suffix}
@@ -576,12 +299,8 @@
requires "libhdf5_hl_cpp%{sonum}%{?my_suffix}-<targettype> = <version>"
requires "libhdf5_tools%{sonum}%{?my_suffix}-<targettype> = <version>"
EOF
-%endif
%build
-%{?with_hpc:%hpc_setup}
-%{?with_hpc:%hpc_debug}
-
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
export FFLAGS="%{optflags}"
@@ -623,7 +342,6 @@
# libhdf5.settings embed incorrect values of the compiler (e.g. ccache instead
# of gcc) causing major issues downstream.
-%if %{without hpc}
%cmake \
%if %{with mpi}
-DCMAKE_C_COMPILER:FILEPATH="%{my_bindir}/mpicc" \
@@ -638,21 +356,6 @@
-DCMAKE_CXX_COMPILER:FILEPATH="%{my_bindir}/c++" \
-DCMAKE_Fortran_COMPILER:FILEPATH="%{my_bindir}/gfortran" \
%endif
-%else # hpc
-%global _hpc_exec_prefix %hpc_exec_prefix
-%global hpc_exec_prefix %_prefix
-%hpc_cmake \
-%define hpc_exec_prefix %{expand:%_hpc_exec_prefix}
- %if %{with mpi}
- -DCMAKE_C_COMPILER:FILEPATH=mpicc \
- -DCMAKE_CXX_COMPILER:FILEPATH=mpicxx \
- -DCMAKE_Fortran_COMPILER:FILEPATH=mpif90 \
- %else
- -DCMAKE_C_COMPILER:FILEPATH=cc \
- -DCMAKE_CXX_COMPILER:FILEPATH=c++ \
- -DCMAKE_Fortran_COMPILER:FILEPATH=gfortran \
- %endif
-%endif # ?hpc
-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
-DALLOW_UNSUPPORTED:BOOL=ON \
-DBUILD_STATIC_LIBS:BOOL=%{?with_static:ON}%{!?with_static:OFF} \
@@ -688,9 +391,6 @@
%cmake_build
%install
-%{?with_hpc:%hpc_setup}
-%{?with_hpc:%hpc_debug}
-
%cmake_install
find %{buildroot} -type f -name "*.la" -delete -print
@@ -715,12 +415,6 @@
cp %{__builddir}/bin/libhdf5_test*.so* %{buildroot}%{my_libdir}
%if %{without mpi}
-
-%if %{with hpc}
-# Manually install examples as cmake does not do it (versioned dir)
-install -m 0755 -d %{buildroot}%{_datadir}/hdf5_examples/%{version}
-cp -pr HDF5Examples/* %{buildroot}%{_datadir}/hdf5_examples/%{version}/
-%else
# Manually install examples as cmake does not do it (unversioned dir)
install -m 0755 -d %{buildroot}%{_datadir}/hdf5_examples
cp -pr HDF5Examples/* %{buildroot}%{_datadir}/hdf5_examples/
@@ -733,8 +427,6 @@
%_hdf5_sonum %{sonum}
%_hdf5_version %{version}
EOF
-%endif
-
%else
# delete examples from parallel builds
find %{buildroot} -type d -name "hdf5_examples" -exec rm -rf {} +;
@@ -746,59 +438,9 @@
%fdupes %{buildroot}/%{my_incdir}/
%fdupes -s %{buildroot}/%{_datadir}
-%if %{with hpc}
-%{hpc_write_pkgconfig -n hdf5 -l hdf5}
-%{hpc_write_pkgconfig -n hdf5_hl -l hdf5_hl}
-%{hpc_write_pkgconfig -n hdf5_fortran -l hdf5_fortran}
-%{hpc_write_pkgconfig -n hdf5_hl_fortran -l hdf5hl_fortran}
-%{hpc_write_pkgconfig -n hdf5_cpp -l hdf5_cpp}
-%{hpc_write_pkgconfig -n hdf5_hl_cpp -l hdf5_hl_cpp}
-
-%hpc_write_modules_files
-#%%Module1.0#####################################################################
-
-proc ModulesHelp { } {
-
-puts stderr " "
-puts stderr "This module loads the %{pname} library built with the
%{compiler_family} compiler 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}"
-
-set version %{version}
-
-prepend-path PATH %{hpc_bindir}
-prepend-path LD_LIBRARY_PATH %{hpc_libdir}
-
-setenv %{hpc_upcase %pname}_DIR %{hpc_prefix}
-setenv %{hpc_upcase %pname}_BIN %{hpc_bindir}
-setenv %{hpc_upcase %pname}_LIB %{hpc_libdir}
-
-if {[file isdirectory %{hpc_includedir}]} {
-prepend-path LIBRARY_PATH %{hpc_libdir}
-prepend-path CPATH %{hpc_includedir}
-prepend-path C_INCLUDE_PATH %{hpc_includedir}
-prepend-path CPLUS_INCLUDE_PATH %{hpc_includedir}
-prepend-path INCLUDE %{hpc_includedir}
-%hpc_modulefile_add_pkgconfig_path
-
-setenv %{hpc_upcase %pname}_INC %{hpc_includedir}
-}
-
-family "%pname"
-
-EOF
-%endif
-
%check
-%{?with_hpc:%hpc_setup}
%if %{with mpi}
- %{?with_hpc:%hpc_setup_mpi}%{!?with_hpc:source %{my_bindir}/mpivars.sh}
+ source %{my_bindir}/mpivars.sh
%endif
%if "%{?mpi_flavor}" != "mpich" || ("%_arch" != "s390" && "%_arch" != "s390x")
@@ -818,11 +460,6 @@
%ldconfig_scriptlets -n %{libname -l _hl_fortran -s %{sonum}}
%ldconfig_scriptlets -n %{libname -l _tools -s %{sonum}}
-%if %{with hpc}
-%postun module
-%hpc_module_delete_if_default
-%endif
-
%if 0%{?sle_version} > 120200 || 0%{?suse_version} > 1320
%define mylicense %license
%else
@@ -831,17 +468,13 @@
%if %{without mpi}
%files -n %{vname}-examples
-%{?with_hpc:%dir %{_prefix}/share/hdf5_examples}
-%{_prefix}/share/hdf5_examples%{?with_hpc:/%{version}}
+%{_prefix}/share/hdf5_examples
-%if %{without hpc}
%files -n %{pname}-devel-data
%{_rpmconfigdir}/macros.d/macros.hdf5
-%endif
%endif # ?mpi
%files -n %{name}
-%{?with_hpc:%dir %my_bindir}
%{my_bindir}/h5clear
%{my_bindir}/h5copy
%{my_bindir}/h5debug
@@ -875,35 +508,30 @@
%doc release_docs/RELEASE.txt
%endif
%defattr(0755,root,root)
-%{?with_hpc:%hpc_dirs}
%{my_libdir}/libhdf5.so.%{sonum}
%{my_libdir}/libhdf5.so.%{sonum}.*
%files -n %{libname -l _hl -s %{sonum}}
%mylicense COPYING
%defattr(0755,root,root)
-%{?with_hpc:%hpc_dirs}
%{my_libdir}/libhdf5_hl.so.%{sonum}
%{my_libdir}/libhdf5_hl.so.%{sonum}.*
%files -n %{libname -l _cpp -s %{sonum}}
%mylicense COPYING
%defattr(0755,root,root)
-%{?with_hpc:%hpc_dirs}
%{my_libdir}/libhdf5_cpp.so.%{sonum}
%{my_libdir}/libhdf5_cpp.so.%{sonum}.*
%files -n %{libname -l _hl_cpp -s %{sonum}}
%mylicense COPYING
%defattr(0755,root,root)
-%{?with_hpc:%hpc_dirs}
%{my_libdir}/libhdf5_hl_cpp.so.%{sonum}
%{my_libdir}/libhdf5_hl_cpp.so.%{sonum}.*
%files -n %{libname -l _fortran -s %{sonum}}
%mylicense COPYING
%defattr(0755,root,root)
-%{?with_hpc:%hpc_dirs}
%{my_libdir}/libhdf5_fortran.so.%{sonum}
%{my_libdir}/libhdf5_fortran.so.%{sonum}.*
%{my_libdir}/libhdf5_f90cstub.so.%{sonum}
@@ -912,7 +540,6 @@
%files -n %{libname -l _hl_fortran -s %{sonum}}
%mylicense COPYING
%defattr(0755,root,root)
-%{?with_hpc:%hpc_dirs}
%{my_libdir}/libhdf5_hl_fortran.so.%{sonum}
%{my_libdir}/libhdf5_hl_fortran.so.%{sonum}.*
%{my_libdir}/libhdf5_hl_f90cstub.so.%{sonum}
@@ -921,28 +548,15 @@
%files -n %{libname -l _tools -s %{sonum}}
%mylicense COPYING
%defattr(0755,root,root)
-%{?with_hpc:%hpc_dirs}
%{my_libdir}/libhdf5_tools.so.%{sonum}
%{my_libdir}/libhdf5_tools.so.%{sonum}.*
-%if %{with hpc}
-%files module
-%hpc_modules_files
-%endif
-
%files devel
##
-%{?with_hpc:%dir %{my_incdir}}
%doc release_docs/HISTORY-1_14.txt
%doc release_docs/RELEASE.txt
%doc ACKNOWLEDGMENTS README.md
%doc release_docs/USING_HDF5_CMake.txt
-%{?with_hpc:%{hpc_pkgconfig_file -n hdf5}}
-%{?with_hpc:%{hpc_pkgconfig_file -N -n hdf5_hl}}
-%{?with_hpc:%{hpc_pkgconfig_file -N -n hdf5_fortran}}
-%{?with_hpc:%{hpc_pkgconfig_file -N -n hdf5_hl_fortran}}
-%{?with_hpc:%{hpc_pkgconfig_file -N -n hdf5_cpp}}
-%{?with_hpc:%{hpc_pkgconfig_file -N -n hdf5_hl_cpp}}
%{my_bindir}/h5c++
%{my_bindir}/h5cc
%{my_bindir}/h5fc
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.n6kHtc/_old 2025-04-03 16:47:34.897071675 +0200
+++ /var/tmp/diff_new_pack.n6kHtc/_new 2025-04-03 16:47:34.909072180 +0200
@@ -3,10 +3,5 @@
<package>openmpi4</package>
<package>openmpi5</package>
<package>mvapich2</package>
- <package>gnu-openmpi4-hpc</package>
- <package>gnu-openmpi5-hpc</package>
- <package>gnu-mvapich2-hpc</package>
- <package>gnu-mpich-hpc</package>
- <package>gnu-hpc</package>
</multibuild>
