Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pnetcdf for openSUSE:Leap:16.0 checked in at 2025-04-10 12:22:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:16.0/pnetcdf (Old) and /work/SRC/openSUSE:Leap:16.0/.pnetcdf.new.1907 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pnetcdf" Thu Apr 10 12:22:31 2025 rev:2 rq:1268338 version:1.12.3 Changes: -------- --- /work/SRC/openSUSE:Leap:16.0/pnetcdf/pnetcdf.changes 2025-03-19 11:54:47.041996252 +0100 +++ /work/SRC/openSUSE:Leap:16.0/.pnetcdf.new.1907/pnetcdf.changes 2025-04-10 12:22:32.481311574 +0200 @@ -1,0 +2,6 @@ +Mon Mar 24 13:18:03 UTC 2025 - Nicolas Morey <nicolas.mo...@suse.com> + +- Disable and remove support for gnu-hpc build flavours (bsc#1239982) +- Add openmpi5 build flavour + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pnetcdf.spec ++++++ --- /var/tmp/diff_new_pack.Xc5pX5/_old 2025-04-10 12:22:32.749322750 +0200 +++ /var/tmp/diff_new_pack.Xc5pX5/_new 2025-04-10 12:22:32.749322750 +0200 @@ -1,7 +1,7 @@ # -# spec file +# spec file for package pnetcdf # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,292 +19,43 @@ %global flavor @BUILD_FLAVOR@%{nil} %define pname pnetcdf -%define ver 1.12.3 -%define _ver 1_12_3 %define sonum 4 %define libname libpnetcdf + # no burst buffering %bcond_with b_buff ExcludeArch: s390 s390x i586 -%if !0%{?is_opensuse} && 0%{?sle_version:1} - %if 0%{?sle_version} < 150100 - %define DisOMPI3 ExclusiveArch: do_not_build - %endif - %if 0%{?sle_version} < 150200 - %define DisOMPI4 ExclusiveArch: do_not_build - %endif -%endif - %if "%{flavor}" == "" %define build_doc 1 -%endif - -%if "%{flavor}" == "mvapich2" -%define mpi_flavor mvapich2 -%bcond_with hpc -%endif - -%if "%{flavor}" == "mpich" -%define mpi_flavor mpich -%bcond_with hpc -%endif - -%if "%{flavor}" == "openmpi4" -%{?DisOMPI4} -%define mpi_flavor openmpi -%define mpi_ver 4 -%bcond_with hpc +%else +%define mpi_flavor %{flavor} %endif %if "%{flavor}" == "openmpi5" -%{?DisOMPI5} -%define mpi_flavor openmpi -%define mpi_ver 5 -%bcond_with hpc -%endif - -%if "%{flavor}" == "doc-hpc" -%bcond_without hpc -%define build_doc 1 -%endif - -%if "%{flavor}" == "gnu-openmpi4-hpc" -%{?DisOMPI4} -%global compiler_family gnu -%undefine c_f_ver -%define mpi_flavor openmpi -%define mpi_ver 4 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu-openmpi5-hpc" -%{?DisOMPI5} -%global compiler_family gnu -%undefine c_f_ver -%define mpi_flavor openmpi -%define mpi_ver 5 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu-mvapich2-hpc" -%global compiler_family gnu -%undefine c_f_ver -%define mpi_flavor mvapich2 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu-mpich-hpc" -%global compiler_family gnu -%undefine c_f_ver -%define mpi_flavor mpich -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu7-hpc" -%global compiler_family gnu -%define c_f_ver 7 -%undefine mpi_flavor -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu7-openmpi4-hpc" -%{?DisOMPI4} -%global compiler_family gnu -%define c_f_ver 7 -%define mpi_flavor openmpi -%define mpi_ver 4 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu7-openmpi5-hpc" -%{?DisOMPI5} -%global compiler_family gnu -%define c_f_ver 7 -%define mpi_flavor openmpi -%define mpi_ver 5 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu7-mvapich2-hpc" -%global compiler_family gnu -%define c_f_ver 7 -%define mpi_flavor mvapich2 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu7-mpich-hpc" -%global compiler_family gnu -%define c_f_ver 7 -%define mpi_flavor mpich -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu8-hpc" -%global compiler_family gnu -%define c_f_ver 8 -%undefine mpi_flavor -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu8-openmpi4-hpc" -%{?DisOMPI4} -%global compiler_family gnu -%define c_f_ver 8 -%define mpi_flavor openmpi -%define mpi_ver 4 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu8-openmpi5-hpc" -%{?DisOMPI5} -%global compiler_family gnu -%define c_f_ver 8 -%define mpi_flavor openmpi -%define mpi_ver 5 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu8-mvapich2-hpc" -%global compiler_family gnu -%define c_f_ver 8 -%define mpi_flavor mvapich2 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu8-mpich-hpc" -%global compiler_family gnu -%define c_f_ver 8 -%define mpi_flavor mpich -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu9-hpc" -%global compiler_family gnu -%define c_f_ver 9 -%undefine mpi_flavor -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu9-openmpi4-hpc" -%{?DisOMPI4} -%global compiler_family gnu -%define c_f_ver 9 -%define mpi_flavor openmpi -%define mpi_ver 4 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu9-openmpi5-hpc" -%{?DisOMPI5} -%global compiler_family gnu -%define c_f_ver 9 -%define mpi_flavor openmpi -%define mpi_ver 5 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu9-mvapich2-hpc" -%global compiler_family gnu -%define c_f_ver 9 -%define mpi_flavor mvapich2 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu9-mpich-hpc" -%global compiler_family gnu -%define c_f_ver 9 -%define mpi_flavor mpich -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu10-hpc" -%global compiler_family gnu -%define c_f_ver 10 -%undefine mpi_flavor -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu10-openmpi4-hpc" -%{?DisOMPI4} -%global compiler_family gnu -%define c_f_ver 10 -%define mpi_flavor openmpi -%define mpi_ver 4 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu10-openmpi5-hpc" -%{?DisOMPI5} -%global compiler_family gnu -%define c_f_ver 10 -%define mpi_flavor openmpi -%define mpi_ver 5 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu10-mvapich2-hpc" -%global compiler_family gnu -%define c_f_ver 10 -%define mpi_flavor mvapich2 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu10-mpich-hpc" -%global compiler_family gnu -%define c_f_ver 10 -%define mpi_flavor mpich -%bcond_without hpc -%endif - -%if "%{mpi_flavor}" != "openmpi" || "%{mpi_ver}" != "1" || 0%{?suse_version} >= 1550 -%define mpi_ext %{?mpi_ver} -%endif - -%if 0%{?!build_doc:1} && (0%{?!mpi_flavor:1}||(0%{?with_hpc:1} && 0%{?!compiler_family:1})) -%{error: Unknown build flavor!} -ExclusiveArch: do_not_build +ExcludeArch: %{ix86} %{arm} %endif %global _defaultlicensedir %{expand:%_defaultlicensedir} -%if %{without hpc} %if 0%{?!build_doc:1} -%define my_suffix -%{mpi_flavor}%{?mpi_ext} +%define my_suffix -%{mpi_flavor} %else # for 'configure' provide an MPI flavor -%define mpi_flavor mvapich2 +%define mpi_flavor openmpi5 %endif + %define package_name %{pname}%{?my_suffix} %define lib_name %{libname}%{sonum}%{?my_suffix} -%global mpiprefix %{_libdir}/mpi/gcc/%{mpi_flavor}%{?mpi_ext} +%global mpiprefix %{_libdir}/mpi/gcc/%{mpi_flavor} %define _prefix %{mpiprefix} %define _bindir %{mpiprefix}/bin %define _libdir %{mpiprefix}/%{_lib} %define _includedir %{mpiprefix}/include %define _mandir %{mpiprefix}/man -%else -ExcludeArch: %ix86 -%{hpc_init %{?!build_doc:-c %compiler_family %{?c_f_ver:-v %{c_f_ver}} -m {%mpi_flavor} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}}} -%define package_name %{hpc_package_name %_ver} -%define lib_name lib%{pname}%{hpc_package_name_tail %_ver} -# fix hpc_base - remove after fixing in macros.hpc? -%global hpc_base %{expand:%hpc_base} -%if 0%{?!build_doc:1} -%define _prefix %hpc_prefix -%define _bindir %hpc_bindir -%define _libdir %hpc_libdir -%define _includedir %hpc_includedir -%define _mandir %hpc_mandir -%else -%define mpi_flavor mvapich2 -%global mpiprefix %{_libdir}/mpi/gcc/%{mpi_flavor}%{?mpi_ext} -%define _prefix %{mpiprefix} -%endif -%endif Name: %package_name -Version: %ver +Version: 1.12.3 Release: 0 Summary: High-performance parallel I/O with the NetCDF scientific data format License: NetCDF @@ -320,25 +71,14 @@ BuildRequires: flex BuildRequires: pkg-config Requires: %{lib_name} = %{version} -%if %{without hpc} -BuildRequires: %{mpi_flavor}%{?mpi_ext}-devel +BuildRequires: %{mpi_flavor}-devel %if 0%{?!build_doc:1} -Requires: %{mpi_flavor}%{?mpi_ext} +Requires: %{mpi_flavor} BuildRequires: gcc-c++ BuildRequires: gcc-fortran %endif #BuildRequires: mpi-selector Provides: parallel-netcdf%{?my_suffix} -%else -%if 0%{?!build_doc:1} -BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel -BuildRequires: %{mpi_flavor}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel -BuildRequires: lua-lmod -%else -BuildRequires: %{mpi_flavor}%{?mpi_ext}-devel -%endif -BuildRequires: suse-hpc -%endif %description NetCDF is a set of software libraries and self-describing, @@ -351,18 +91,12 @@ This package contains the %{mpi_flavor} version of utility functions for working with NetCDF files. -%{?!build_doc:%{?with_hpc:%{hpc_master_package}}} - %package -n %{lib_name} Summary: High-performance parallel I/O with the NetCDF scientific data format # Unversioned provides to allow e.g. netcdf to pull in pnetcdf with the # same flavor Group: System/Libraries -%if %{without hpc} Provides: %{libname}%{my_suffix} -%else -%{hpc_requires} -%endif %description -n %{lib_name} NetCDF is a set of software libraries and data formats for array-oriented @@ -373,8 +107,6 @@ This package contains the %{mpi_flavor} version of the PnetCDF runtime libraries. -%{?!build_doc:%{?with_hpc:%{hpc_master_package -L -l}}} - %package -n %{pname}-devel-data Summary: Development data files for %{name} Group: Development/Libraries/Parallel @@ -394,15 +126,11 @@ Summary: Development files for %{name} Group: Development/Libraries/Parallel Requires: %{lib_name} = %{version} -%if %{without hpc} %if 0%{?!build_doc:1} -Requires: %{mpi_flavor}%{?mpi_ext}-devel +Requires: %{mpi_flavor}-devel %endif Requires: %{pname}-devel-data Provides: parallel-netcdf%{?my_suffix}-devel -%else -%{hpc_requires_devel} -%endif %description devel NetCDF is a set of software libraries and data formats for array-oriented @@ -413,13 +141,11 @@ This package contains all files needed to create projects that use the %{mpi_flavor} version of PnetCDF. -%{?!build_doc:%{?with_hpc:%{hpc_master_package devel}}} - %package devel-static Summary: Static development files for %{name} Group: Development/Libraries/Parallel Requires: %{name}-devel = %{version} -%{?!with_hpc:Provides: parallel-netcdf%{?my_suffix}-devel-static} +Provides: parallel-netcdf%{?my_suffix}-devel-static %description devel-static NetCDF is a set of software libraries and data formats for array-oriented @@ -443,8 +169,6 @@ This package contains the documentation for PnetCDF. -%{?build_doc:%{?with_hpc:%{hpc_master_package doc}}} - %prep %setup -q -n %{pname}-%{version} @@ -454,21 +178,12 @@ export FCFLAGS="%{optflags}" export FFLAGS="%{optflags}" -%if %{without hpc} source %{_bindir}/mpivars.sh %configure --prefix=%{_prefix} \ --libdir=%{_libdir} \ --enable-shared \ %{?with_b_buff:--enable-burst-buffering} \ --with-mpi=%{_prefix} -%else -%{hpc_setup} -# if these environment variables confuse the build -unset CC CXX F77 F90 FC -#sed -ie "s@#! /bin/sh@#! /bin/sh -x@" ./configure -%hpc_configure --with-mpi=$MPI_DIR --enable-shared \ - %{?with_b_buff:--enable-burst-buffering} -%endif %make_build # Build tests without executing @@ -504,61 +219,11 @@ %_pnetcdf_version %{version} EOF %endif - %if %{with hpc} -%hpc_write_modules_files -#%%Module1.0##################################################################### - -proc ModulesHelp { } { - -puts stderr " " -puts stderr "This module loads the %{hpc_upcase %pname} library built with the %{compiler_flavor}" -puts stderr "toolchain and the %{mpi_flavor}%{?mpi_ver} MPI stack." -puts stderr " " -puts stderr "A typical compilation step for C applications requiring NetCDF is as follows:" -puts stderr " " -puts stderr "\\\$CC -I\\\$PNETCDF_INC app.c -L\\\$PNETCDF_LIB -lpnetcdf" - -puts stderr "\nVersion %{version}\n" - -module-whatis "Name: %{hpc_upcase %pname} built with %{compiler_family} toolchain compiler and %{mpi_flavor} MPI" -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 MANPATH %{hpc_mandir} -prepend-path LD_LIBRARY_PATH %{hpc_libdir} - -setenv %{hpc_upcase %pname}_DIR %{hpc_prefix} -setenv %{hpc_upcase %pname}_BIN %{hpc_bindir} - -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}_LIB %{hpc_libdir} -setenv %{hpc_upcase %pname}_INC %{hpc_includedir} - - } -} -EOF - %endif %endif %if 0%{?!build_doc:1} %check -%if %{without hpc} source %{_bindir}/mpivars.sh -%else -%{hpc_setup} -%endif %make_build check %post -n %{lib_name} @@ -566,7 +231,6 @@ %postun -n %{lib_name} /sbin/ldconfig -N %{_libdir} -%{?with_hpc:%hpc_module_delete_if_default} %if "%{flavor}" == "openmpi4" %files -n %{pname}-devel-data @@ -574,25 +238,19 @@ %endif %files -%{_bindir}%{?!with_hpc:/*} -%{?with_hpc:%dir %hpc_datadir} +%{_bindir}/* %dir %{_mandir} %{_mandir}/* %files -n %{lib_name} %license COPYRIGHT COPYING -%if %{with hpc} -%hpc_dirs -%hpc_modules_files -%endif %doc CREDITS RELEASE_NOTES AUTHORS %doc README %{_libdir}/*.so.* %files devel -%{_includedir}%{?!with_hpc:/*} +%{_includedir}/* %{_libdir}/*.so -%{?with_hpc:%hpc_pkgconfig_file -n pnetcdf} %{_libdir}/pkgconfig/pnetcdf.pc %files devel-static ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.Xc5pX5/_old 2025-04-10 12:22:32.781324083 +0200 +++ /var/tmp/diff_new_pack.Xc5pX5/_new 2025-04-10 12:22:32.785324251 +0200 @@ -2,9 +2,6 @@ <package>mvapich2</package> <package>mpich</package> <package>openmpi4</package> - <package>doc-hpc</package> - <package>gnu-openmpi4-hpc</package> - <package>gnu-mvapich2-hpc</package> - <package>gnu-mpich-hpc</package> + <package>openmpi5</package> </multibuild>