commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2020-09-15 16:25:48 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new.4249 (New) Package is "netcdf-fortran" Tue Sep 15 16:25:48 2020 rev:17 rq:834367 version:4.5.2 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2020-07-21 15:51:12.404355783 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new.4249/netcdf-fortran.changes 2020-09-15 16:26:22.914487171 +0200 @@ -1,0 +2,24 @@ +Mon Sep 14 14:01:08 UTC 2020 - Egbert Eich + +- Make static build conditional. + The race due to libtool not allowing to handle f90 .mod files + when building static and dynamic versions of this library requires + to disable static builds by default. + +--- +Thu Jul 23 16:39:20 UTC 2020 - Egbert Eich + +- Add build support for gcc10 to HPC build (bsc#1174439). +- Add build support for openmpi4. +- Limit the numbers of parallel build to kludge around a race + condition due to libtool not being able to handle Fortran .mod + file creation and dependencies properly. +- Make sure, optimization flags are also passed to the Fortran + compiler. +- Remove not used options to configure. +- Add -ffat-lto-objects for static build. +- limit number of parallel jobs as libtool generated builds are + racy when .mod files have to be generated. +- Increasing memory constrains to make sure tests don't fail. + +--- Other differences: -- ++ netcdf-fortran.spec ++ --- /var/tmp/diff_new_pack.SEvTnn/_old 2020-09-15 16:26:23.974488186 +0200 +++ /var/tmp/diff_new_pack.SEvTnn/_new 2020-09-15 16:26:23.974488186 +0200 @@ -39,10 +39,13 @@ %if "%flavor" == "" ExclusiveArch: do_not_build %define package_name %pname +%define compiler_family gnu %endif ExcludeArch:s390 s390x +%{bcond_with staticlibs} + %if "%flavor" == "gnu-hpc" %global compiler_family gnu %{bcond_with mpi} @@ -92,6 +95,12 @@ %{bcond_without mpi} %endif +%if "%flavor" == "gnu7-hpc" +%global compiler_family gnu +%{bcond_with mpi} +%global c_f_ver 7 +%endif + %if "%flavor" == "gnu7-openmpi-hpc" %{?DisOMPI1} %global compiler_family gnu @@ -142,6 +151,12 @@ %{bcond_without mpi} %endif +%if "%flavor" == "gnu8-hpc" +%global compiler_family gnu +%{bcond_with mpi} +%global c_f_ver 8 +%endif + %if "%flavor" == "gnu8-openmpi-hpc" %{?DisOMPI1} %global compiler_family gnu @@ -192,6 +207,12 @@ %{bcond_without mpi} %endif +%if "%flavor" == "gnu9-hpc" +%global compiler_family gnu +%{bcond_with mpi} +%global c_f_ver 9 +%endif + %if "%flavor" == "gnu9-openmpi-hpc" %{?DisOMPI1} %global compiler_family gnu @@ -242,9 +263,71 @@ %{bcond_without mpi} %endif +%if "%flavor" == "gnu10-hpc" +%global compiler_family gnu +%{bcond_with mpi} +%global c_f_ver 10 +%endif + +%if "%flavor" == "gnu10-openmpi-hpc" +%{?DisOMPI1} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 1 +%global c_f_ver 10 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu10-openmpi2-hpc" +%{?DisOMPI2} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 2 +%global c_f_ver 10 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu10-openmpi3-hpc" +%{?DisOMPI3} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 3 +%global c_f_ver 10 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu10-openmpi4-hpc" +%{?DisOMPI4} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 4 +%global c_f_ver 10 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu10-mvapich2-hpc" +%global compiler_family gnu +%global mpi_flavor mvapich2 +%global c_f_ver 10 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu10-mpich-hpc" +%global compiler_family gnu +%global mpi_flavor mpich +%global c_f_ver 10 +%{bcond_without mpi} +%endif + +%define limit_cores(c:) %{?_smp_mflags: %(a=1; + b=$(sed -se "s/.*-j[[:space:]]*\\([[:digit:]]\\+\\).*/\\1/" <<< %_smp_mflags); + [ $b -le $a ] || b=$a ; + sed -se "s/\\(.*-j[[:space:]]*\\)[[:digit:]]\\+\\(.*\\)/\\1$b/" <<< %_smp_mflags )} + %define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') %{?hpc_init:%{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?with_mpi:-m %mpi_flavor %{?mpi_ver:-V %mpi_ver +%{!?hpc_package_name_tail:%define hpc_package_name_tail %{nil}} %if 0%{!?package_name:1} %define package_name %{hpc_package_name %_ver} @@ -293,7 +376,7 @@ %package -n %{libname}%{hpc_package_name_tail %_ver} Summary:Shared lib
commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2020-07-21 15:49:16 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new.3592 (New) Package is "netcdf-fortran" Tue Jul 21 15:49:16 2020 rev:16 rq:822017 version:4.5.2 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2020-07-17 20:50:21.700889720 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new.3592/netcdf-fortran.changes 2020-07-21 15:51:12.404355783 +0200 @@ -1,0 +2,14 @@ +Mon Jul 20 10:35:19 UTC 2020 - Egbert Eich + +- Add OpenMPI4 support (disabled < 15.3) + +--- +Mon Jul 20 05:18:32 UTC 2020 - Egbert Eich + +- The convention is to use the module name 'pnetcdf' for + Parallel-NetCDF (called PnetCDF now). Revert part of the + changes in previous commit to conform to this standard. +- Fix ldconfig args for HPC packages: no caching should be done + as these libs are made available thru LD_LIBRARY_PATH tweaking. + +--- Other differences: -- ++ netcdf-fortran.spec ++ --- /var/tmp/diff_new_pack.lsYZrz/_old 2020-07-21 15:51:14.840358745 +0200 +++ /var/tmp/diff_new_pack.lsYZrz/_new 2020-07-21 15:51:14.844358750 +0200 @@ -27,8 +27,13 @@ %if 0%{?sle_version} >= 150200 %define DisOMPI1 ExclusiveArch: do_not_build %endif -%if !0%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200 -%define DisOMPI3 ExclusiveArch: do_not_build +%if !0%{?is_opensuse} && 0%{?sle_version:1} + %if 0%{?sle_version} < 150200 + %define DisOMPI3 ExclusiveArch: do_not_build + %endif + %if 0%{?sle_version} < 150300 + %define DisOMPI4 ExclusiveArch: do_not_build + %endif %endif %if "%flavor" == "" @@ -67,6 +72,14 @@ %{bcond_without mpi} %endif +%if "%flavor" == "gnu-openmpi4-hpc" +%{?DisOMPI4} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 4 +%{bcond_without mpi} +%endif + %if "%flavor" == "gnu-mvapich2-hpc" %global compiler_family gnu %global mpi_flavor mvapich2 @@ -106,6 +119,15 @@ %{bcond_without mpi} %endif +%if "%flavor" == "gnu7-openmpi4-hpc" +%{?DisOMPI4} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 4 +%global c_f_ver 7 +%{bcond_without mpi} +%endif + %if "%flavor" == "gnu7-mvapich2-hpc" %global compiler_family gnu %global mpi_flavor mvapich2 @@ -147,6 +169,15 @@ %{bcond_without mpi} %endif +%if "%flavor" == "gnu8-openmpi4-hpc" +%{?DisOMPI4} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 4 +%global c_f_ver 8 +%{bcond_without mpi} +%endif + %if "%flavor" == "gnu8-mvapich2-hpc" %global compiler_family gnu %global mpi_flavor mvapich2 @@ -188,6 +219,15 @@ %{bcond_without mpi} %endif +%if "%flavor" == "gnu9-openmpi4-hpc" +%{?DisOMPI4} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 4 +%global c_f_ver 9 +%{bcond_without mpi} +%endif + %if "%flavor" == "gnu9-mvapich2-hpc" %global compiler_family gnu %global mpi_flavor mvapich2 @@ -209,7 +249,6 @@ %if 0%{!?package_name:1} %define package_name %{hpc_package_name %_ver} %endif -%{?with_mpi:%global hpc_module_pname p%{pname}} Name: %package_name %define libname libnetcdf-fortran @@ -336,7 +375,7 @@ %build %{hpc_setup} -module load %{?with_mpi:p}netcdf +module load netcdf export CFLAGS="-I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" export FCFLAGS="-std=legacy" export FFLAGS=$FCFLAGS @@ -361,7 +400,7 @@ %install %{hpc_setup} -module load %{?with_mpi:p}netcdf +module load netcdf export CFLAGS="-I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" export CPPFLAGS=$CFLAGS export LDFLAGS="-L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" @@ -404,8 +443,8 @@ # Require generic netcdf if [ expr [ module-info mode load ] || [module-info mode display ] ] { -if { ![is-loaded %{?with_mpi:p}netcdf] } { -module load %{?with_mpi:p}netcdf +if { ![is-loaded netcdf] } { +module load netcdf } } @@ -435,7 +474,7 @@ %if %_do_check %check %{hpc_setup} -module load %{?with_mpi:p}netcdf +module load netcdf export CFLAGS="-I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" export CPPFLAGS=$CFLAGS export LDFLAGS="-L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" @@ -447,9 +486,11 @@ make check %endif -%post -n %{libname}%{hpc_package_name_tail %_ver} -p /sbin/ldconfig +%post -n %{libname}%{hpc_package_name_tail %_ver} +/sbin/ldconfig -N %{hpc_libdir} + %postun -n %{libname}%{hpc_package_name_tail %_ver} -/sbin/ldconfig +/sbin/ldconfig -N %{hpc_libdir} %hpc_module_
commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2020-07-17 20:49:36 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new.3592 (New) Package is "netcdf-fortran" Fri Jul 17 20:49:36 2020 rev:15 rq:821326 version:4.5.2 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2020-07-01 20:44:07.618376362 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new.3592/netcdf-fortran.changes 2020-07-17 20:50:21.700889720 +0200 @@ -1,0 +2,8 @@ +Wed Jul 15 16:55:04 UTC 2020 - Egbert Eich + +- Add serial HPC build flavor (boo#1174177). + For loading serial module, run 'module load netcdf-fortran' + for an MPI variant use 'module load pnetcdf-fortran'. +- Fixed bug in module file. + +--- Other differences: -- ++ netcdf-fortran.spec ++ --- /var/tmp/diff_new_pack.AWjhhG/_old 2020-07-17 20:50:22.756890821 +0200 +++ /var/tmp/diff_new_pack.AWjhhG/_new 2020-07-17 20:50:22.760890826 +0200 @@ -38,6 +38,11 @@ ExcludeArch:s390 s390x +%if "%flavor" == "gnu-hpc" +%global compiler_family gnu +%{bcond_with mpi} +%endif + %if "%flavor" == "gnu-openmpi-hpc" %{?DisOMPI1} %global compiler_family gnu @@ -204,6 +209,7 @@ %if 0%{!?package_name:1} %define package_name %{hpc_package_name %_ver} %endif +%{?with_mpi:%global hpc_module_pname p%{pname}} Name: %package_name %define libname libnetcdf-fortran @@ -236,10 +242,10 @@ machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. -%if 0%{!?mpi_flavor:1} +%if %{without mpi} This package contains utility functions for working with NetCDF files. %else -This package contains the openmpi version of utility functions for +This package contains the %{mpi_flavor} version of utility functions for working with NetCDF files. %endif @@ -330,15 +336,17 @@ %build %{hpc_setup} -module load pnetcdf +module load %{?with_mpi:p}netcdf export CFLAGS="-I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" +export FCFLAGS="-std=legacy" +export FFLAGS=$FCFLAGS export CPPFLAGS=$CFLAGS export LDFLAGS="-L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" -%if 0%{?mpi_flavor:1} +%if %{with mpi} export CC="mpicc" -export FC="mpif90 -std=legacy" -export F77="mpif77 -std=legacy" +export FC="mpif90" +export F77="mpif77" %endif %hpc_configure \ --enable-shared \ @@ -353,11 +361,11 @@ %install %{hpc_setup} -module load pnetcdf +module load %{?with_mpi:p}netcdf export CFLAGS="-I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" export CPPFLAGS=$CFLAGS export LDFLAGS="-L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" -%if 0%{?mpi_flavor:1} +%if %{with mpi} export CC="mpicc" export FC="mpif90" export F77="mpif77" @@ -396,8 +404,8 @@ # Require generic netcdf if [ expr [ module-info mode load ] || [module-info mode display ] ] { -if { ![is-loaded netcdf] } { -module load pnetcdf +if { ![is-loaded %{?with_mpi:p}netcdf] } { +module load %{?with_mpi:p}netcdf } } @@ -427,11 +435,11 @@ %if %_do_check %check %{hpc_setup} -module load pnetcdf +module load %{?with_mpi:p}netcdf export CFLAGS="-I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" export CPPFLAGS=$CFLAGS export LDFLAGS="-L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" -%if 0%{?mpi_flavor:1} +%if 0%{with mpi} export CC="mpicc" export FC="mpif90" export F77="mpif77" ++ _multibuild ++ --- /var/tmp/diff_new_pack.AWjhhG/_old 2020-07-17 20:50:22.804890871 +0200 +++ /var/tmp/diff_new_pack.AWjhhG/_new 2020-07-17 20:50:22.804890871 +0200 @@ -1,4 +1,5 @@ + gnu-hpc gnu-openmpi-hpc gnu-openmpi2-hpc gnu-openmpi3-hpc
commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2020-07-01 20:44:06 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new.3060 (New) Package is "netcdf-fortran" Wed Jul 1 20:44:06 2020 rev:14 rq:818157 version:4.5.2 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2020-03-29 14:27:23.418149502 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new.3060/netcdf-fortran.changes 2020-07-01 20:44:07.618376362 +0200 @@ -1,0 +2,6 @@ +Wed Jul 1 15:36:46 UTC 2020 - Egbert Eich + +- Gfortran from gcc-10 requires -std=legacy to build the Fortran + code in netcdf-fortran (bsc#1173598). + +--- Other differences: -- ++ netcdf-fortran.spec ++ --- /var/tmp/diff_new_pack.ONxDw7/_old 2020-07-01 20:44:08.130377976 +0200 +++ /var/tmp/diff_new_pack.ONxDw7/_new 2020-07-01 20:44:08.134377989 +0200 @@ -337,8 +337,8 @@ %if 0%{?mpi_flavor:1} export CC="mpicc" -export FC="mpif90" -export F77="mpif77" +export FC="mpif90 -std=legacy" +export F77="mpif77 -std=legacy" %endif %hpc_configure \ --enable-shared \
commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2020-03-29 14:27:15 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new.3160 (New) Package is "netcdf-fortran" Sun Mar 29 14:27:15 2020 rev:13 rq:789302 version:4.5.2 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2019-12-11 12:13:38.956536438 +0100 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new.3160/netcdf-fortran.changes 2020-03-29 14:27:23.418149502 +0200 @@ -1,0 +2,5 @@ +Sat Mar 28 06:37:55 UTC 2020 - Egbert Eich + +- Enable mvapich2 build (boo#1167948). + +--- Other differences: -- ++ netcdf-fortran.spec ++ --- /var/tmp/diff_new_pack.13kOzb/_old 2020-03-29 14:27:24.250149927 +0200 +++ /var/tmp/diff_new_pack.13kOzb/_new 2020-03-29 14:27:24.258149931 +0200 @@ -1,7 +1,7 @@ # # spec file for package netcdf-fortran # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ _multibuild ++ --- /var/tmp/diff_new_pack.13kOzb/_old 2020-03-29 14:27:24.294149950 +0200 +++ /var/tmp/diff_new_pack.13kOzb/_new 2020-03-29 14:27:24.294149950 +0200 @@ -3,5 +3,5 @@ gnu-openmpi2-hpc gnu-openmpi3-hpc gnu-mpich-hpc - + gnu-mvapich2-hpc
commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2019-12-11 12:13:09 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new.4691 (New) Package is "netcdf-fortran" Wed Dec 11 12:13:09 2019 rev:12 rq:755678 version:4.5.2 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2019-12-02 11:31:30.690555397 +0100 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new.4691/netcdf-fortran.changes 2019-12-11 12:13:38.956536438 +0100 @@ -4 +4 @@ -- Add support for gcc8 and gcc9 (jsc#SLE-7766 & jsc#SLE-8609). +- Add support for gcc8 and gcc9 (jsc#SLE-7766 & jsc#SLE-8604). Other differences: -- ++ netcdf-fortran.spec ++ --- /var/tmp/diff_new_pack.B9UlNB/_old 2019-12-11 12:13:40.140536105 +0100 +++ /var/tmp/diff_new_pack.B9UlNB/_new 2019-12-11 12:13:40.144536103 +0100 @@ -1,7 +1,7 @@ # -# spec file for package netcdf +# spec file for package netcdf-fortran # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed
commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2019-12-02 11:29:20 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new.4691 (New) Package is "netcdf-fortran" Mon Dec 2 11:29:20 2019 rev:11 rq:752491 version:4.5.2 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2019-11-28 13:51:41.846675976 +0100 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new.4691/netcdf-fortran.changes 2019-12-02 11:31:30.690555397 +0100 @@ -1,0 +2,11 @@ +Fri Nov 29 18:41:12 UTC 2019 - Egbert Eich + +- Add support for gcc8 and gcc9 (jsc#SLE-7766 & jsc#SLE-8609). + +--- +Thu Nov 28 15:34:01 UTC 2019 - Egbert Eich + +- Disable openmpi1 builds for SLE/Leap > 15.1. +- Enable openmpi3 builds for Leap and SLE > 15.1 (jsc#SLE-7773). + +--- Other differences: -- ++ netcdf-fortran.spec ++ --- /var/tmp/diff_new_pack.l7TmZ7/_old 2019-12-02 11:31:32.350554629 +0100 +++ /var/tmp/diff_new_pack.l7TmZ7/_new 2019-12-02 11:31:32.382554614 +0100 @@ -24,9 +24,10 @@ %global ver 4.5.2 %global _ver 4_5_2 -%if 0%{?is_opensuse} || 0%{?is_backports} -%undefine DisOMPI3 -%else +%if 0%{?sle_version} >= 150200 +%define DisOMPI1 ExclusiveArch: do_not_build +%endif +%if !0%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200 %define DisOMPI3 ExclusiveArch: do_not_build %endif @@ -45,19 +46,19 @@ %{bcond_without mpi} %endif -%if "%flavor" == "gnu-openmpi3-hpc" -%{?DisOMPI3} +%if "%flavor" == "gnu-openmpi2-hpc" +%{?DisOMPI2} %global compiler_family gnu %global mpi_flavor openmpi -%global mpi_ver 3 +%global mpi_ver 2 %{bcond_without mpi} %endif -%if "%flavor" == "gnu-openmpi2-hpc" -%{?DisOMPI2} +%if "%flavor" == "gnu-openmpi3-hpc" +%{?DisOMPI3} %global compiler_family gnu %global mpi_flavor openmpi -%global mpi_ver 2 +%global mpi_ver 3 %{bcond_without mpi} %endif @@ -82,10 +83,19 @@ %{bcond_without mpi} %endif -%if "%flavor" == "gnu7-openmpi3-hpc" +%if "%flavor" == "gnu7-openmpi2-hpc" %{?DisOMPI2} %global compiler_family gnu %global mpi_flavor openmpi +%global mpi_ver 2 +%global c_f_ver 7 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu7-openmpi3-hpc" +%{?DisOMPI3} +%global compiler_family gnu +%global mpi_flavor openmpi %global mpi_ver 3 %global c_f_ver 7 %{bcond_without mpi} @@ -105,6 +115,88 @@ %{bcond_without mpi} %endif +%if "%flavor" == "gnu8-openmpi-hpc" +%{?DisOMPI1} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 1 +%global c_f_ver 8 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu8-openmpi2-hpc" +%{?DisOMPI2} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 2 +%global c_f_ver 8 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu8-openmpi3-hpc" +%{?DisOMPI3} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 3 +%global c_f_ver 8 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu8-mvapich2-hpc" +%global compiler_family gnu +%global mpi_flavor mvapich2 +%global c_f_ver 8 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu8-mpich-hpc" +%global compiler_family gnu +%global mpi_flavor mpich +%global c_f_ver 8 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu9-openmpi-hpc" +%{?DisOMPI1} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 1 +%global c_f_ver 9 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu9-openmpi2-hpc" +%{?DisOMPI2} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 2 +%global c_f_ver 9 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu9-openmpi3-hpc" +%{?DisOMPI3} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 3 +%global c_f_ver 9 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu9-mvapich2-hpc" +%global compiler_family gnu +%global mpi_flavor mvapich2 +%global c_f_ver 9 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu9-mpich-hpc" +%global compiler_family gnu +%global mpi_flavor mpich +%global c_f_ver 9 +%{bcond_without mpi} +%endif + %define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') %{?hpc_init:%{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?with_mpi:-m %mpi_flavor %{?mpi_ver:-V %mpi_ver
commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2019-11-28 13:51:36 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new.26869 (New) Package is "netcdf-fortran" Thu Nov 28 13:51:36 2019 rev:10 rq:751572 version:4.5.2 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2019-10-02 12:00:25.378796831 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new.26869/netcdf-fortran.changes 2019-11-28 13:51:41.846675976 +0100 @@ -1,0 +2,6 @@ +Thu Nov 28 10:57:25 UTC 2019 - Egbert Eich + +- Add constraints for disk and memory, this will hopefully fix + build issues with 15.2 (bsc#1157973). + +--- New: _constraints Other differences: -- ++ _constraints ++ 2 2 1
commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2019-10-02 12:00:22 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new.2352 (New) Package is "netcdf-fortran" Wed Oct 2 12:00:22 2019 rev:9 rq:734397 version:4.5.2 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2019-09-02 13:24:43.993319392 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new.2352/netcdf-fortran.changes 2019-10-02 12:00:25.378796831 +0200 @@ -1,0 +2,12 @@ +Tue Oct 1 13:52:13 UTC 2019 - Ana Guerrero Lopez + +- Update to version 4.5.2, read changes at: + * https://github.com/Unidata/netcdf-fortran/releases/tag/v4.5.2 + * https://github.com/Unidata/netcdf-fortran/releases/tag/v4.5.1 + * https://github.com/Unidata/netcdf-fortran/releases/tag/v4.5.0 +- Remove patch, merged upstream + * netcdf4-Return-status-for-non-void-function-always.patch +- Add new BuildRequires on m4 +- Spec file cleanup + +--- @@ -4 +16,2 @@ -- Update to version 4.4.5, see changes at: +- Update to version 4.4.5, (jsc#SLE-8496), see changes at: + * https://github.com/Unidata/netcdf-fortran/releases/tag/v4.4.5 Old: netcdf-fortran-4.4.5.tar.gz netcdf4-Return-status-for-non-void-function-always.patch New: netcdf-fortran-4.5.2.tar.gz Other differences: -- ++ netcdf-fortran.spec ++ --- /var/tmp/diff_new_pack.XEkjVF/_old 2019-10-02 12:00:26.182794770 +0200 +++ /var/tmp/diff_new_pack.XEkjVF/_new 2019-10-02 12:00:26.182794770 +0200 @@ -21,8 +21,8 @@ %define _do_check 1 %global pname netcdf-fortran -%global ver 4.4.5 -%global _ver 4_4_5 +%global ver 4.5.2 +%global _ver 4_5_2 %if 0%{?is_opensuse} || 0%{?is_backports} %undefine DisOMPI3 @@ -120,16 +120,15 @@ Group: Productivity/Scientific/Other Version:%ver Release:0 -%define sonum 6 +%define sonum 7 URL:https://www.unidata.ucar.edu/software/netcdf/ Source: https://github.com/Unidata/netcdf-fortran/archive/v%{version}.tar.gz#/%{pname}-%{version}.tar.gz -Patch0: netcdf4-Return-status-for-non-void-function-always.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: %{compiler_family}-compilers-hpc BuildRequires: gawk BuildRequires: libcurl-devel >= 7.18.0 BuildRequires: lua-lmod +BuildRequires: m4 BuildRequires: pkg-config BuildRequires: suse-hpc BuildRequires: zlib-devel >= 1.2.5 @@ -233,7 +232,6 @@ %prep %setup -q -n %{pname}-%{version} -%patch0 -p1 # Fix spurious-executable-perm RPMLINT warning chmod a-x RELEASE_NOTES.md @@ -355,18 +353,15 @@ %hpc_module_delete_if_default %files -%defattr(-,root,root,-) %doc COPYRIGHT README.md RELEASE_NOTES.md %{hpc_bindir}/ %files -n %{libname}%{hpc_package_name_tail %_ver} -%defattr(-,root,root,-) %{hpc_dirs} %{hpc_modules_files} %{hpc_libdir}/libnetcdff.so.* %files devel -%defattr(-,root,root,-) %{hpc_includedir}/ %dir %{hpc_pkgconfigdir} %{hpc_libdir}/pkgconfig/netcdf-fortran.pc @@ -376,7 +371,6 @@ %{hpc_mandir}/man3/ %files devel-static -%defattr(-,root,root,-) %{hpc_libdir}/libnetcdff.a %changelog ++ netcdf-fortran-4.4.5.tar.gz -> netcdf-fortran-4.5.2.tar.gz ++ 174222 lines of diff (skipped)
commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2019-09-02 13:24:42 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new.7948 (New) Package is "netcdf-fortran" Mon Sep 2 13:24:42 2019 rev:8 rq:726778 version:4.4.5 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2018-05-01 23:33:01.388027346 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new.7948/netcdf-fortran.changes 2019-09-02 13:24:43.993319392 +0200 @@ -1,0 +2,11 @@ +Mon Aug 26 18:43:28 UTC 2019 - Ana Guerrero Lopez + +- Update to version 4.4.5, see changes at: + * https://www.unidata.ucar.edu/blogs/news/entry/netcdf-fortran-4-4-4 +- Update Source to rename the tarball with the format $name-$version +- Set BuildRequires on netcdf to 4.6.2 or higher, this is required for + this version to build +- Refresh patch + * netcdf4-Return-status-for-non-void-function-always.patch + +--- Old: v4.4.4.tar.gz New: netcdf-fortran-4.4.5.tar.gz Other differences: -- ++ netcdf-fortran.spec ++ --- /var/tmp/diff_new_pack.PqWKEC/_old 2019-09-02 13:24:44.693319260 +0200 +++ /var/tmp/diff_new_pack.PqWKEC/_new 2019-09-02 13:24:44.693319260 +0200 @@ -1,7 +1,7 @@ # # spec file for package netcdf # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,8 +21,8 @@ %define _do_check 1 %global pname netcdf-fortran -%global ver 4.4.4 -%global _ver 4_4_4 +%global ver 4.4.5 +%global _ver 4_4_5 %if 0%{?is_opensuse} || 0%{?is_backports} %undefine DisOMPI3 @@ -121,8 +121,8 @@ Version:%ver Release:0 %define sonum 6 -Url:http://www.unidata.ucar.edu/software/netcdf/ -Source: https://github.com/Unidata/netcdf-fortran/archive/v%{version}.tar.gz +URL:https://www.unidata.ucar.edu/software/netcdf/ +Source: https://github.com/Unidata/netcdf-fortran/archive/v%{version}.tar.gz#/%{pname}-%{version}.tar.gz Patch0: netcdf4-Return-status-for-non-void-function-always.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel @@ -137,7 +137,7 @@ BuildRequires: %{mpi_flavor}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel %endif BuildRequires: hdf5-%{compiler_family}%{?c_f_ver}%{?with_mpi:-%{mpi_flavor}%{?mpi_ver}}-hpc-devel -BuildRequires: netcdf-%{compiler_family}%{?c_f_ver}%{?with_mpi:-%{mpi_flavor}%{?mpi_ver}}-hpc-devel +BuildRequires: netcdf-%{compiler_family}%{?c_f_ver}%{?with_mpi:-%{mpi_flavor}%{?mpi_ver}}-hpc-devel >= 4.6.2 Requires: %{libname}%{hpc_package_name_tail %_ver} = %{version} %description ++ netcdf4-Return-status-for-non-void-function-always.patch ++ --- /var/tmp/diff_new_pack.PqWKEC/_old 2019-09-02 13:24:44.725319254 +0200 +++ /var/tmp/diff_new_pack.PqWKEC/_new 2019-09-02 13:24:44.725319254 +0200 @@ -12,33 +12,29 @@ caller. Signed-off-by: Egbert Eich - fortran/nf_lib.c | 8 ++-- - 1 file changed, 2 insertions(+), 6 deletions(-) -diff --git a/fortran/nf_lib.c b/fortran/nf_lib.c -index 8e93f52..e081bc3 100755 a/fortran/nf_lib.c -+++ b/fortran/nf_lib.c -@@ -171,9 +171,7 @@ nc_inq_numgrps(int ncid, int *numgrps) +diff -Nrua a/fortran/nf_lib.c b/fortran/nf_lib.c +--- a/fortran/nf_lib.c 2019-01-10 02:02:05.0 +0100 b/fortran/nf_lib.c 2019-08-27 10:13:01.494856231 +0200 +@@ -171,9 +171,8 @@ { int ret; - if ((ret = nc_inq_grps(ncid, numgrps, NULL))) -- --return ret; + return nc_inq_grps(ncid, numgrps, NULL); + +-return ret; } extern int -@@ -181,9 +179,7 @@ nc_inq_numtypes(int ncid, int *numtypes) +@@ -181,9 +180,8 @@ { int ret; - if ((ret = nc_inq_typeids(ncid, numtypes, NULL))) -- --return ret; + return nc_inq_typeids(ncid, numtypes, NULL); + +-return ret; } - #endif /*USE_NETCDF4*/ + extern int
commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2018-05-01 23:32:59 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new (New) Package is "netcdf-fortran" Tue May 1 23:32:59 2018 rev:7 rq:602642 version:4.4.4 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2018-03-29 11:56:40.796058373 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new/netcdf-fortran.changes 2018-05-01 23:33:01.388027346 +0200 @@ -1,0 +2,6 @@ +Mon Apr 30 18:01:09 UTC 2018 - e...@suse.com + +- (Temporarily) disable fpr S390* as a check test for netcdf fails + currently on BE (bsc#1091474). + +--- Other differences: -- ++ netcdf-fortran.spec ++ --- /var/tmp/diff_new_pack.I5tffZ/_old 2018-05-01 23:33:01.892009017 +0200 +++ /var/tmp/diff_new_pack.I5tffZ/_new 2018-05-01 23:33:01.896008872 +0200 @@ -35,6 +35,8 @@ %define package_name %pname %endif +ExcludeArch:s390 s390x + %if "%flavor" == "gnu-openmpi-hpc" %{?DisOMPI1} %global compiler_family gnu
commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2018-03-29 11:56:38 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new (New) Package is "netcdf-fortran" Thu Mar 29 11:56:38 2018 rev:6 rq:591676 version:4.4.4 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2018-02-22 15:00:23.118451968 +0100 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new/netcdf-fortran.changes 2018-03-29 11:56:40.796058373 +0200 @@ -1,0 +2,6 @@ +Tue Mar 27 13:35:04 UTC 2018 - e...@suse.com + +- Fix hdf5 devel package dependency of static HPC library package + to pull in the HPC variant (boo#1087090). + +--- Other differences: -- ++ netcdf-fortran.spec ++ --- /var/tmp/diff_new_pack.L2E6UX/_old 2018-03-29 11:56:41.356038153 +0200 +++ /var/tmp/diff_new_pack.L2E6UX/_new 2018-03-29 11:56:41.360038009 +0200 @@ -217,7 +217,7 @@ Group: Development/Libraries/Parallel Requires: %{name}-devel = %{version} #Requires: hdf-devel -Requires: hdf5-devel >= 1.8.8 +Requires: hdf5-%{compiler_family}%{?c_f_ver}%{?with_mpi:-%{mpi_flavor}%{?mpi_ver}}-hpc-devel >= 1.8.8 Requires: libcurl-devel >= 7.18.0 Requires: zlib-devel >= 1.2.5
commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2018-02-22 15:00:21 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new (New) Package is "netcdf-fortran" Thu Feb 22 15:00:21 2018 rev:5 rq:574864 version:4.4.4 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2018-02-06 16:47:01.398050812 +0100 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new/netcdf-fortran.changes 2018-02-22 15:00:23.118451968 +0100 @@ -1,0 +2,10 @@ +Fri Feb 9 20:13:15 UTC 2018 - e...@suse.com + +- Add support for openmpi2 for HPC (FATE#325089). + +--- +Fri Feb 9 15:26:02 UTC 2018 - e...@suse.com + +- Fix summary in module files (bnc#1080259). + +--- Other differences: -- ++ netcdf-fortran.spec ++ --- /var/tmp/diff_new_pack.KNczQg/_old 2018-02-22 15:00:23.886424339 +0100 +++ /var/tmp/diff_new_pack.KNczQg/_new 2018-02-22 15:00:23.886424339 +0100 @@ -51,6 +51,14 @@ %{bcond_without mpi} %endif +%if "%flavor" == "gnu-openmpi2-hpc" +%{?DisOMPI2} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 2 +%{bcond_without mpi} +%endif + %if "%flavor" == "gnu-mvapich2-hpc" %global compiler_family gnu %global mpi_flavor mvapich2 @@ -290,7 +298,7 @@ module-whatis "Name: %{hpc_upcase %pname} built with %{compiler_family} toolchain %{mpi_flavor: and %{mpi_flavor}}" module-whatis "Version: %{version}" module-whatis "Category: runtime library" -module-whatis "Description: %{summary}" +module-whatis "Description: %{SUMMARY:0}" module-whatis "%{url}" # Require generic netcdf ++ _multibuild ++ --- /var/tmp/diff_new_pack.KNczQg/_old 2018-02-22 15:00:23.926422900 +0100 +++ /var/tmp/diff_new_pack.KNczQg/_new 2018-02-22 15:00:23.926422900 +0100 @@ -1,5 +1,6 @@ gnu-openmpi-hpc + gnu-openmpi2-hpc gnu-openmpi3-hpc gnu-mpich-hpc
commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2018-02-06 16:47:00 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new (New) Package is "netcdf-fortran" Tue Feb 6 16:47:00 2018 rev:4 rq:570208 version:4.4.4 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2017-11-21 15:33:22.371034298 +0100 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new/netcdf-fortran.changes 2018-02-06 16:47:01.398050812 +0100 @@ -1,0 +2,17 @@ +Fri Jan 26 19:39:13 UTC 2018 - e...@suse.com + +- Fix the module load command for netcdf to reflect the change + to 'pnetcdf' for MPI versions following (boo#1075933). + +--- +Fri Jan 12 15:43:10 UTC 2018 - e...@suse.com + +- Disable the openmpi3 flavor in some products. + +--- +Fri Jan 5 19:12:40 UTC 2018 - e...@suse.com + +- Switch from gcc6 to gcc7 as additional compiler flavor for HPC on SLES. +- Add support for mpich and openmpi3 for HPC. + +--- Other differences: -- ++ netcdf-fortran.spec ++ --- /var/tmp/diff_new_pack.Fqd3tk/_old 2018-02-06 16:47:02.002022551 +0100 +++ /var/tmp/diff_new_pack.Fqd3tk/_new 2018-02-06 16:47:02.006022364 +0100 @@ -1,7 +1,7 @@ # -# spec file for package netcdf-fortran +# spec file for package netcdf # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,36 +24,74 @@ %global ver 4.4.4 %global _ver 4_4_4 +%if 0%{?is_opensuse} || 0%{?is_backports} +%undefine DisOMPI3 +%else +%define DisOMPI3 ExclusiveArch: do_not_build +%endif + %if "%flavor" == "" ExclusiveArch: do_not_build %define package_name %pname %endif %if "%flavor" == "gnu-openmpi-hpc" +%{?DisOMPI1} %global compiler_family gnu %global mpi_flavor openmpi %global mpi_ver 1 %{bcond_without mpi} %endif +%if "%flavor" == "gnu-openmpi3-hpc" +%{?DisOMPI3} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 3 +%{bcond_without mpi} +%endif + %if "%flavor" == "gnu-mvapich2-hpc" %global compiler_family gnu %global mpi_flavor mvapich2 %{bcond_without mpi} %endif -%if "%flavor" == "gnu6-openmpi-hpc" +%if "%flavor" == "gnu-mpich-hpc" +%global compiler_family gnu +%global mpi_flavor mpich +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu7-openmpi-hpc" +%{?DisOMPI1} %global compiler_family gnu %global mpi_flavor openmpi %global mpi_ver 1 -%global c_f_ver 6 +%global c_f_ver 7 %{bcond_without mpi} %endif -%if "%flavor" == "gnu6-mvapich2-hpc" +%if "%flavor" == "gnu7-openmpi3-hpc" +%{?DisOMPI2} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 3 +%global c_f_ver 7 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu7-mvapich2-hpc" %global compiler_family gnu %global mpi_flavor mvapich2 -%global c_f_ver 6 +%global c_f_ver 7 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu7-mpich-hpc" +%global compiler_family gnu +%global mpi_flavor mpich +%global c_f_ver 7 %{bcond_without mpi} %endif @@ -77,14 +115,14 @@ Source: https://github.com/Unidata/netcdf-fortran/archive/v%{version}.tar.gz Patch0:netcdf4-Return-status-for-non-void-function-always.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gawk +BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: %{compiler_family}-compilers-hpc +BuildRequires: gawk BuildRequires: libcurl-devel >= 7.18.0 +BuildRequires: lua-lmod BuildRequires: pkg-config -BuildRequires: zlib-devel >= 1.2.5 -BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: suse-hpc -BuildRequires: lua-lmod +BuildRequires: zlib-devel >= 1.2.5 %if %{with mpi} BuildRequires: %{mpi_flavor}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel %endif @@ -150,8 +188,8 @@ Summary:Development files for %{name} Group: Development/Libraries/Parallel Requires: %{libname}%{hpc_package_name_tail %_ver} = %{version} -Requires: pkgconfig Requires: libcurl-devel >= 7.18.0 +Requires: pkgconfig Requires: zlib-devel >= 1.2.5 %hpc_requires_devel Requires: netcdf-%{compiler_family}%{?c_f_ver}%{?with_mpi:-%{mpi_flavor}%{?mpi_ver}}-hpc-devel @@ -192,7 +230,7 @@ %build %{hpc_setup} -module load netcdf +module loa
commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2017-11-21 15:33:22 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new (New) Package is "netcdf-fortran" Tue Nov 21 15:33:22 2017 rev:3 rq:543902 version:4.4.4 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2017-11-13 14:06:39.816576266 +0100 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new/netcdf-fortran.changes 2017-11-21 15:33:22.371034298 +0100 @@ -1,0 +2,11 @@ +Wed Nov 15 13:30:29 UTC 2017 - e...@suse.com + +- Fix typo in modules file which made help less useful. + +--- +Tue Nov 14 11:12:31 UTC 2017 - e...@suse.com + +- Fix modules file: only use %hpc_bindir if it really exists +- Translate '-' to '_' for env-variable. + +--- Other differences: -- ++ netcdf-fortran.spec ++ --- /var/tmp/diff_new_pack.9ix9tp/_old 2017-11-21 15:33:22.891015454 +0100 +++ /var/tmp/diff_new_pack.9ix9tp/_new 2017-11-21 15:33:22.891015454 +0100 @@ -57,6 +57,8 @@ %{bcond_without mpi} %endif +%define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') + %{?hpc_init:%{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?with_mpi:-m %mpi_flavor %{?mpi_ver:-V %mpi_ver %if 0%{!?package_name:1} @@ -162,7 +164,7 @@ This package contains all files needed to create projects that use %{?mpi_flavor:the %mpi_flavor version of} NetCDF. -%{hpc_master_pachage devel} +%{hpc_master_package devel} %package devel-static Summary:Static development files for %{name} @@ -242,7 +244,7 @@ puts stderr "version of NetCDF are loaded automatically via this module. A typical compilation" puts stderr "example for Fortran applications requiring NetCDF is as follows:" puts stderr " " -puts stderr "\\\$FC -I\\\$NETCDF_FORTRAN_INC app.f90 -L\\\$NETCDF_FORTRAN_LIB -lnetcdff -L\\\$NETCDF_LIB -lnetcdf -L\$HDF5_LIB -lhdf5" +puts stderr "\\\$FC -I\\\$NETCDF_FORTRAN_INC app.f90 -L\\\$NETCDF_FORTRAN_LIB -lnetcdff -L\\\$NETCDF_LIB -lnetcdf -L\\\$HDF5_LIB -lhdf5" puts stderr "\nVersion %{version}\n" @@ -267,9 +269,10 @@ prepend-pathMANPATH %{hpc_mandir} prepend-pathLD_LIBRARY_PATH %{hpc_libdir} -setenv %{hpc_upcase %pname}_DIR%{hpc_prefix} -setenv %{hpc_upcase %pname}_BIN%{hpc_bindir} - +setenv %{hpc_upcase_trans_hyph %pname}_DIR%{hpc_prefix} +if {[file isdirectory %{hpc_bindir}]} { +setenv %{hpc_upcase_trans_hyph %pname}_BIN%{hpc_bindir} +} if {[file isdirectory %{hpc_includedir}]} { prepend-pathLIBRARY_PATH%{hpc_libdir} prepend-pathCPATH %{hpc_includedir} @@ -278,8 +281,8 @@ prepend-pathINCLUDE %{hpc_includedir} %hpc_modulefile_add_pkgconfig_path -setenv %{hpc_upcase %pname}_LIB%{hpc_libdir} -setenv %{hpc_upcase %pname}_INC%{hpc_includedir} +setenv %{hpc_upcase_trans_hyph %pname}_LIB%{hpc_libdir} +setenv %{hpc_upcase_trans_hyph %pname}_INC%{hpc_includedir} } EOF
commit netcdf-fortran for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2017-11-13 14:05:16 Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new (New) Package is "netcdf-fortran" Mon Nov 13 14:05:16 2017 rev:2 rq:541146 version:4.4.4 Changes: --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2017-10-26 18:44:29.431653264 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new/netcdf-fortran.changes 2017-11-13 14:06:39.816576266 +0100 @@ -1,0 +2,6 @@ +Fri Nov 10 16:22:10 UTC 2017 - e...@suse.com + +- Add Requires: for the netcdf library/devel package to the + netcdf-fortran library/devel package for HPC. + +--- Other differences: -- ++ netcdf-fortran.spec ++ --- /var/tmp/diff_new_pack.sKgkHJ/_old 2017-11-13 14:06:40.852538998 +0100 +++ /var/tmp/diff_new_pack.sKgkHJ/_new 2017-11-13 14:06:40.856538854 +0100 @@ -108,6 +108,7 @@ Summary:Shared libraries for the NetCDF scientific data format Group: System/Libraries %hpc_requires +Requires: libnetcdf-%{compiler_family}%{?c_f_ver}%{?with_mpi:-%{mpi_flavor}%{?mpi_ver}}-hpc %description -n %{libname}%{hpc_package_name_tail %_ver} NetCDF is a set of software libraries and self-describing, @@ -151,6 +152,7 @@ Requires: libcurl-devel >= 7.18.0 Requires: zlib-devel >= 1.2.5 %hpc_requires_devel +Requires: netcdf-%{compiler_family}%{?c_f_ver}%{?with_mpi:-%{mpi_flavor}%{?mpi_ver}}-hpc-devel %description devel NetCDF is a set of software libraries and self-describing,